diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-12-10 18:46:24 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-12-10 18:46:24 +0100 |
| commit | 7f9187c26fd120bd2f0ce089e5f46c4bd3c4193b (patch) | |
| tree | 5077dcdafcf3281b94ef31eee399c35e7bfadf4b /arch/arm/mach-omap1/board-voiceblue.c | |
| parent | omap: Split omap_read/write functions for omap1 and omap2+ (diff) | |
| download | linux-7f9187c26fd120bd2f0ce089e5f46c4bd3c4193b.tar.xz linux-7f9187c26fd120bd2f0ce089e5f46c4bd3c4193b.zip | |
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/board-voiceblue.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-voiceblue.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c index f5992c239bcd..b2838bfeab86 100644 --- a/arch/arm/mach-omap1/board-voiceblue.c +++ b/arch/arm/mach-omap1/board-voiceblue.c @@ -83,6 +83,9 @@ static struct platform_device serial_device = { static int __init ext_uart_init(void) { + if (!machine_is_voiceblue()) + return -ENODEV; + return platform_device_register(&serial_device); } arch_initcall(ext_uart_init); @@ -236,6 +239,9 @@ static struct notifier_block panic_block = { static int __init voiceblue_setup(void) { + if (!machine_is_voiceblue()) + return -ENODEV; + /* Setup panic notifier */ atomic_notifier_chain_register(&panic_notifier_list, &panic_block); |