diff options
Diffstat (limited to 'arch/arm/mach-sa1100/assabet.c')
-rw-r--r-- | arch/arm/mach-sa1100/assabet.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c index f2030bc22cde..e2d411a8d4ce 100644 --- a/arch/arm/mach-sa1100/assabet.c +++ b/arch/arm/mach-sa1100/assabet.c | |||
@@ -425,21 +425,8 @@ static void __init assabet_map_io(void) | |||
425 | */ | 425 | */ |
426 | Ser1SDCR0 |= SDCR0_SUS; | 426 | Ser1SDCR0 |= SDCR0_SUS; |
427 | 427 | ||
428 | if (machine_has_neponset()) { | 428 | if (!machine_has_neponset()) |
429 | #ifdef CONFIG_ASSABET_NEPONSET | ||
430 | extern void neponset_map_io(void); | ||
431 | |||
432 | /* | ||
433 | * We map Neponset registers even if it isn't present since | ||
434 | * many drivers will try to probe their stuff (and fail). | ||
435 | * This is still more friendly than a kernel paging request | ||
436 | * crash. | ||
437 | */ | ||
438 | neponset_map_io(); | ||
439 | #endif | ||
440 | } else { | ||
441 | sa1100_register_uart_fns(&assabet_port_fns); | 429 | sa1100_register_uart_fns(&assabet_port_fns); |
442 | } | ||
443 | 430 | ||
444 | /* | 431 | /* |
445 | * When Neponset is attached, the first UART should be | 432 | * When Neponset is attached, the first UART should be |