summaryrefslogtreecommitdiff
path: root/arch/arm/mach-ux500/board-mop500.c
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@linaro.org>2012-03-08 13:04:19 +0100
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 11:02:46 +0200
commit8cc483dc079b636e94d8f552cc63599b07dafb17 (patch)
tree1345dc67ac903ebad3b8d0496ae440f8b113e2c4 /arch/arm/mach-ux500/board-mop500.c
parent00bd6002117c2bb881cc607f3f56f89bc92280a8 (diff)
mach-ux500: Put b2r2 specific stuff under conditional compilation
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
Diffstat (limited to 'arch/arm/mach-ux500/board-mop500.c')
-rw-r--r--arch/arm/mach-ux500/board-mop500.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index a0efc82eb34..8ce94900a17 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -950,8 +950,10 @@ static struct platform_device *mop500_platform_devs[] __initdata = {
#ifdef CONFIG_FB_MCDE
&u8500_mcde_device,
#endif
+#ifdef CONFIG_FB_B2R2
&u8500_b2r2_device,
&u8500_b2r2_blt_device,
+#endif
&u8500_thsens_device,
#ifdef CONFIG_LEDS_PWM
&ux500_leds_device,
@@ -1192,8 +1194,10 @@ static struct platform_device *snowball_platform_devs[] __initdata = {
#ifdef CONFIG_FB_MCDE
&u8500_mcde_device,
#endif
+#ifdef CONFIG_FB_B2R2
&u8500_b2r2_device,
&u8500_b2r2_blt_device,
+#endif
};
static void fixup_ab8505_gpio(void)