From ab76fb4bcbea8fc9acb285cd29a701ae0e934da5 Mon Sep 17 00:00:00 2001 From: Robert Marklund Date: Fri, 30 Sep 2011 22:26:26 +0200 Subject: 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 --- arch/arm/mach-ux500/board-u5500-mcde.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'arch') 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; -- cgit v1.2.3