diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2005-08-23 13:36:27 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-23 13:36:27 +0000 |
| commit | fcb42fc75c2f7ec104735fcfbef993ec62e946c8 (patch) | |
| tree | 2270afc2033f1c503e62b1935f64b2cf1540048f /packages/linux/nslu2-kernel | |
| parent | 7203552a097c7429519f89ed179f241496cf6394 (diff) | |
| parent | 639df729bedfa9e2ed58c8a7e7240d05a23752d2 (diff) | |
merge of ddc841bc5413de481ba5f7392575bba7a9ef04a7
and f19ce428c20ed51be635a051213519acfded5d4b
Diffstat (limited to 'packages/linux/nslu2-kernel')
| -rw-r--r-- | packages/linux/nslu2-kernel/2.6.12/nslu2-setup.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/packages/linux/nslu2-kernel/2.6.12/nslu2-setup.c b/packages/linux/nslu2-kernel/2.6.12/nslu2-setup.c index 47be53bf81..cc3b987575 100644 --- a/packages/linux/nslu2-kernel/2.6.12/nslu2-setup.c +++ b/packages/linux/nslu2-kernel/2.6.12/nslu2-setup.c @@ -76,14 +76,10 @@ static struct resource nslu2_uart_resources[] = { .flags = IORESOURCE_MEM }, { - }, -#if 0 - , { .start = IXP4XX_UART2_BASE_PHYS, .end = IXP4XX_UART2_BASE_PHYS + 0x0fff, .flags = IORESOURCE_MEM } -#endif }; static struct plat_serial8250_port nslu2_uart_data[] = { @@ -97,19 +93,14 @@ static struct plat_serial8250_port nslu2_uart_data[] = { .uartclk = IXP4XX_UART_XTAL, }, { - }, - -#if 0 - , { .mapbase = IXP4XX_UART2_BASE_PHYS, .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET, - .irq = IRQ_IXP4XX_UART1, + .irq = IRQ_IXP4XX_UART2, .flags = UPF_BOOT_AUTOCONF, .iotype = UPIO_MEM, .regshift = 2, .uartclk = IXP4XX_UART_XTAL, } -#endif }; static struct platform_device nslu2_uart = { |