]> err.no Git - linux-2.6/commitdiff
Blackfin arch: fix bug when enable uart1 with uart0 disabled => no initial console
authorSonic Zhang <sonic.zhang@analog.com>
Wed, 21 Nov 2007 09:04:41 +0000 (17:04 +0800)
committerBryan Wu <bryan.wu@analog.com>
Wed, 21 Nov 2007 09:04:41 +0000 (17:04 +0800)
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Bryan Wu <bryan.wu@analog.com>
arch/blackfin/mach-bf537/boards/stamp.c

index a2c347c85e20c6d7ab842fc1674d5926ca9ba69e..07b0dc273d2f0b13ba87a3ec089b52f54af356be 100644 (file)
@@ -578,15 +578,20 @@ static struct platform_device bfin_fb_adv7393_device = {
 
 #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
 static struct resource bfin_uart_resources[] = {
+#ifdef CONFIG_SERIAL_BFIN_UART0
        {
                .start = 0xFFC00400,
                .end = 0xFFC004FF,
                .flags = IORESOURCE_MEM,
-       }, {
+       },
+#endif
+#ifdef CONFIG_SERIAL_BFIN_UART1
+       {
                .start = 0xFFC02000,
                .end = 0xFFC020FF,
                .flags = IORESOURCE_MEM,
        },
+#endif
 };
 
 static struct platform_device bfin_uart_device = {