summaryrefslogtreecommitdiffstats
path: root/arch/ppc/syslib/mpc85xx_devices.c
diff options
context:
space:
mode:
author2005-05-26 07:47:10 +0200
committerJeff Garzik2005-05-26 07:47:10 +0200
commit949d33e70f2c3e93bfe5265a50e40175b1ab1ec1 (patch)
treeca88fd8f8f81b167dc4685ed34e9636f267db60d /arch/ppc/syslib/mpc85xx_devices.c
parent[libata] ATA passthru (arbitrary ATA command execution) (diff)
parentMerge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff)
downloadkernel-qcow2-linux-949d33e70f2c3e93bfe5265a50e40175b1ab1ec1.tar.gz
kernel-qcow2-linux-949d33e70f2c3e93bfe5265a50e40175b1ab1ec1.tar.xz
kernel-qcow2-linux-949d33e70f2c3e93bfe5265a50e40175b1ab1ec1.zip
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD
Diffstat (limited to 'arch/ppc/syslib/mpc85xx_devices.c')
-rw-r--r--arch/ppc/syslib/mpc85xx_devices.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ppc/syslib/mpc85xx_devices.c b/arch/ppc/syslib/mpc85xx_devices.c
index a231795ee26f..1e658ef57e75 100644
--- a/arch/ppc/syslib/mpc85xx_devices.c
+++ b/arch/ppc/syslib/mpc85xx_devices.c
@@ -61,6 +61,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
.iotype = UPIO_MEM,
.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_SHARE_IRQ,
},
+ { },
};
struct platform_device ppc_sys_platform_devices[] = {