diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-12-10 09:46:24 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-12-10 09:46:24 -0800 |
| commit | 7f9187c26fd120bd2f0ce089e5f46c4bd3c4193b (patch) | |
| tree | 5077dcdafcf3281b94ef31eee399c35e7bfadf4b /arch/arm/mach-omap1/board-ams-delta.c | |
| parent | df1e9d1c218ba696e376cad371b57c0109fe98c9 (diff) | |
| download | kernel_samsung_smdk4412-7f9187c26fd120bd2f0ce089e5f46c4bd3c4193b.zip kernel_samsung_smdk4412-7f9187c26fd120bd2f0ce089e5f46c4bd3c4193b.tar.gz kernel_samsung_smdk4412-7f9187c26fd120bd2f0ce089e5f46c4bd3c4193b.tar.bz2 | |
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-ams-delta.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-ams-delta.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c index 9d97a72..dc82f3d 100644 --- a/arch/arm/mach-omap1/board-ams-delta.c +++ b/arch/arm/mach-omap1/board-ams-delta.c @@ -339,6 +339,9 @@ static int __init ams_delta_modem_init(void) { int err; + if (!machine_is_ams_delta()) + return -ENODEV; + omap_cfg_reg(M14_1510_GPIO2); ams_delta_modem_ports[0].irq = gpio_to_irq(AMS_DELTA_GPIO_PIN_MODEM_IRQ); |