summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRobert Marklund <robert.marklund@stericsson.com>2011-09-30 22:26:26 +0200
committerRobert Marklund <robert.marklund@stericsson.com>2011-10-05 15:09:46 +0200
commitab76fb4bcbea8fc9acb285cd29a701ae0e934da5 (patch)
tree0043fd005d4a7ea509aa229f169a4d76cda094bf /arch
parent46965ef9f01ffa5239ecb110f8bc97e90737387a (diff)
u5500: mcde: Fix build errors
Make id build even without CONFIG_MCDE_DISPLAY_HDMI_FB_AUTO_CREATE Change-Id: I831fba4be5c12fd44f1228ac01ae943dcc17a911 Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-ux500/board-u5500-mcde.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-ux500/board-u5500-mcde.c b/arch/arm/mach-ux500/board-u5500-mcde.c
index 25bcc14dadd..7e538cf7b63 100644
--- a/arch/arm/mach-ux500/board-u5500-mcde.c
+++ b/arch/arm/mach-ux500/board-u5500-mcde.c
@@ -333,11 +333,12 @@ static int display_postregistered_callback(struct notifier_block *nb,
virtual_height = height * 3;
#endif
#ifdef CONFIG_DISPLAY_AV8100_TERTIARY
- if (ddev->id == AV8100_DISPLAY_ID)
+ if (ddev->id == AV8100_DISPLAY_ID) {
#ifdef CONFIG_MCDE_DISPLAY_HDMI_FB_AUTO_CREATE
hdmi_fb_onoff(ddev, 1, 0, 0);
#endif /* CONFIG_MCDE_DISPLAY_HDMI_FB_AUTO_CREATE */
- else
+ ;
+ } else
#endif /* CONFIG_DISPLAY_AV8100_TERTIARY */
{
struct mcde_fb *mfb;