Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-block.git] / arch / arm / mach-kirkwood / rd88f6281-setup.c

diff --git a/arch/arm/mach-kirkwood/rd88f6281-setup.c b/arch/arm/mach-kirkwood/rd88f6281-setup.c
index b6416615c0b9c0667157c257f733c4cfce30c0b4..f785093e433f4f3f8d8feeb460691980a5413e50 100644 (file)
--- a/arch/arm/mach-kirkwood/rd88f6281-setup.c
+++ b/arch/arm/mach-kirkwood/rd88f6281-setup.c
@@ -90,7 +90,6 @@ static void __init rd88f6281_init(void)
        kirkwood_rtc_init();
        kirkwood_sata_init(&rd88f6281_sata_data);
        kirkwood_uart0_init();
-       kirkwood_uart1_init();
 
        platform_device_register(&rd88f6281_nand_flash);
 }