aboutsummaryrefslogtreecommitdiff
path: root/arch/ppc/syslib/mpc85xx_devices.c
diff options
context:
space:
mode:
author <jgarzik@pretzel.yyz.us>2005-05-26 01:47:10 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-05-26 01:47:10 -0400
commit949d33e70f2c3e93bfe5265a50e40175b1ab1ec1 (patch)
treeca88fd8f8f81b167dc4685ed34e9636f267db60d /arch/ppc/syslib/mpc85xx_devices.c
parentb095518ef51c37658c58367bd19240b8a113f25c (diff)
parentbef9c558841604116704e10b3d9ff3dbf4939423 (diff)
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 a231795ee26..1e658ef57e7 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[] = {