diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2012-03-08 13:04:19 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:02:46 +0200 |
| commit | 8cc483dc079b636e94d8f552cc63599b07dafb17 (patch) | |
| tree | 1345dc67ac903ebad3b8d0496ae440f8b113e2c4 | |
| parent | 00bd6002117c2bb881cc607f3f56f89bc92280a8 (diff) | |
mach-ux500: Put b2r2 specific stuff under conditional compilation
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/devices-db8500.c | 4 |
2 files changed, 8 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) diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c index ee376a504b8..28f6da58e1e 100644 --- a/arch/arm/mach-ux500/devices-db8500.c +++ b/arch/arm/mach-ux500/devices-db8500.c @@ -29,7 +29,9 @@ #include <mach/hsi.h> #endif #include <mach/ste-dma40-db8500.h> +#ifdef CONFIG_FB_B2R2 #include <video/b2r2_blt.h> +#endif #include "pins-db8500.h" @@ -251,6 +253,7 @@ struct platform_device u8500_mcde_device = { }; #endif /* CONFIG_FB_MCDE */ +#ifdef CONFIG_FB_B2R2 struct platform_device u8500_b2r2_blt_device = { .name = "b2r2_blt", .id = 0, @@ -291,6 +294,7 @@ struct platform_device u8500_b2r2_device = { .num_resources = ARRAY_SIZE(b2r2_resources), .resource = b2r2_resources, }; +#endif /* CONFIG_FB_B2R2 */ /* * WATCHDOG |