diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-02-28 14:43:18 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-02-28 14:43:18 -0800 |
| commit | e9d69010996539b07caef1c9fa9a481e1df95e68 (patch) | |
| tree | 6ba66fa720a3c0c187dee58f06a5647ffdf4b53e /arch/arm/mach-omap2/devices.c | |
| parent | d82ba9954b6b2c4ac91ec6f6f42be8c5215d0619 (diff) | |
| parent | c295fb633e321a7df3b8846c4eaddc5da3e0aaed (diff) | |
Merge branch 'randconfig' into fixes-non-critical
Diffstat (limited to 'arch/arm/mach-omap2/devices.c')
| -rw-r--r-- | arch/arm/mach-omap2/devices.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 283d11eae693..3ffefe275ea0 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -654,9 +654,7 @@ void __init omap242x_init_mmc(struct omap_mmc_platform_data **mmc_data) /*-------------------------------------------------------------------------*/ #if defined(CONFIG_HDQ_MASTER_OMAP) || defined(CONFIG_HDQ_MASTER_OMAP_MODULE) -#if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_SOC_OMAP3430) #define OMAP_HDQ_BASE 0x480B2000 -#endif static struct resource omap_hdq_resources[] = { { .start = OMAP_HDQ_BASE, @@ -679,7 +677,10 @@ static struct platform_device omap_hdq_dev = { }; static inline void omap_hdq_init(void) { - (void) platform_device_register(&omap_hdq_dev); + if (cpu_is_omap2420()) + return; + + platform_device_register(&omap_hdq_dev); } #else static inline void omap_hdq_init(void) {} |