diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-06 15:39:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-06 15:39:15 -0700 |
| commit | 107177410b754b597028e430725bc3b316936b6b (patch) | |
| tree | 146b9f2c0b032408d2e78ac69074e5d9bab2ffbd /arch/arm/mach-ixp4xx/ixdp425-setup.c | |
| parent | 07bbeaf12310263d808b1958f8413b95f98786ea (diff) | |
| parent | 450008b5a62bb09445ae05c4d01d510386c9435d (diff) | |
| download | talos-obmc-linux-107177410b754b597028e430725bc3b316936b6b.tar.gz talos-obmc-linux-107177410b754b597028e430725bc3b316936b6b.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-ixp4xx/ixdp425-setup.c')
| -rw-r--r-- | arch/arm/mach-ixp4xx/ixdp425-setup.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c index f2e9c0ea0501..c2ba759e9946 100644 --- a/arch/arm/mach-ixp4xx/ixdp425-setup.c +++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c @@ -95,7 +95,8 @@ static struct plat_serial8250_port ixdp425_uart_data[] = { .iotype = UPIO_MEM, .regshift = 2, .uartclk = IXP4XX_UART_XTAL, - } + }, + { }, }; static struct platform_device ixdp425_uart = { |
