diff options
author | Tony Lindgren <tony@atomide.com> | 2010-12-10 12:46:24 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-12-10 12:46:24 -0500 |
commit | 7f9187c26fd120bd2f0ce089e5f46c4bd3c4193b (patch) | |
tree | 5077dcdafcf3281b94ef31eee399c35e7bfadf4b /arch/arm/mach-omap1/devices.c | |
parent | df1e9d1c218ba696e376cad371b57c0109fe98c9 (diff) |
omap1: Add initcall checks for omap1 and booted board
Otherwise multi-omap1 configurations will fail.
Tested-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1/devices.c')
-rw-r--r-- | arch/arm/mach-omap1/devices.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c index 86ad38a20c3e..b0f4c231595f 100644 --- a/arch/arm/mach-omap1/devices.c +++ b/arch/arm/mach-omap1/devices.c | |||
@@ -288,6 +288,9 @@ static inline void omap_init_audio(void) {} | |||
288 | */ | 288 | */ |
289 | static int __init omap1_init_devices(void) | 289 | static int __init omap1_init_devices(void) |
290 | { | 290 | { |
291 | if (!cpu_class_is_omap1()) | ||
292 | return -ENODEV; | ||
293 | |||
291 | /* please keep these calls, and their implementations above, | 294 | /* please keep these calls, and their implementations above, |
292 | * in alphabetical order so they're easier to sort through. | 295 | * in alphabetical order so they're easier to sort through. |
293 | */ | 296 | */ |