diff options
| author | Jonas Aaberg <jonas.aberg@stericsson.com> | 2010-05-12 11:43:24 +0200 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2010-09-02 22:45:08 -0600 |
| commit | 76acb8fd913f95a237ed19ad7eb9f60f62217463 (patch) | |
| tree | f223628f204a448056eacbd435311e024a9e5109 /arch | |
| parent | cd073608c8a5bfecd06b4af404e435b92b6e99bf (diff) | |
mach-ux500: Added #ifdef around pmem stuff
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Diffstat (limited to 'arch')
| -rwxr-xr-x | arch/arm/mach-ux500/board-mop500.c | 2 | ||||
| -rwxr-xr-x | arch/arm/mach-ux500/devices.c | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 4d425055350..db715cd43fe 100755 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -1018,9 +1018,11 @@ static struct platform_device *platform_board_devs[] __initdata = { &u8500_mcde0_device, #endif /* CONFIG_FB_U8500_MCDE_CHANNELA */ &ux500_b2r2_device, +#ifdef CONFIG_ANDROID_PMEM &u8500_pmem_device, &u8500_pmem_mio_device, &u8500_pmem_hwb_device, +#endif #ifdef CONFIG_CRYPTO_DEV_UX500_HASH &ux500_hash1_device, #endif diff --git a/arch/arm/mach-ux500/devices.c b/arch/arm/mach-ux500/devices.c index 72de25531d2..cee705af2d3 100755 --- a/arch/arm/mach-ux500/devices.c +++ b/arch/arm/mach-ux500/devices.c @@ -32,7 +32,9 @@ #include <linux/spi/spi-stm.h> #include <linux/mmc/host.h> #include <asm/setup.h> +#ifdef CONFIG_ANDROID_PMEM #include <linux/android_pmem.h> +#endif #include <mach/msp.h> #include <mach/i2c.h> #include <mach/shrm.h> @@ -324,6 +326,7 @@ struct platform_device ux500_b2r2_device = { .resource = b2r2_resources, }; +#ifdef CONFIG_ANDROID_PMEM static void __init early_pmem_generic_parse(char **p, struct android_pmem_platform_data * data) { data->size = memparse(*p, p); @@ -408,6 +411,7 @@ struct platform_device u8500_pmem_hwb_device = { .platform_data = &pmem_hwb_pdata, }, }; +#endif struct amba_device ux500_rtc_device = { .dev = { |