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

[karo-tx-linux.git] / arch / arm / mach-kirkwood / db88f6281-bp-setup.c

diff --git a/arch/arm/mach-kirkwood/db88f6281-bp-setup.c b/arch/arm/mach-kirkwood/db88f6281-bp-setup.c
index cd317795f3559779e3ac788fff66028b243b3cd6..a14c2948c62aa6a257f40d400c642e5f1cc91b8d 100644 (file)
--- a/arch/arm/mach-kirkwood/db88f6281-bp-setup.c
+++ b/arch/arm/mach-kirkwood/db88f6281-bp-setup.c
@@ -44,7 +44,6 @@ static void __init db88f6281_init(void)
        kirkwood_rtc_init();
        kirkwood_sata_init(&db88f6281_sata_data);
        kirkwood_uart0_init();
-       kirkwood_uart1_init();
 }
 
 static int __init db88f6281_pci_init(void)