diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 18:30:14 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 18:30:14 -0400 |
| commit | 0db7443b2bd0b92da4e8afa46f8123a7076136c6 (patch) | |
| tree | 325c388b7d99015896b583dfec775a837957b762 /arch/ppc/syslib/mpc85xx_devices.c | |
| parent | 63068465fa9ba8258e341f70c07cd2221b8c114d (diff) | |
| parent | 6df29debb7fc04ac3f92038c57437f40bab4e72d (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'arch/ppc/syslib/mpc85xx_devices.c')
| -rw-r--r-- | arch/ppc/syslib/mpc85xx_devices.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc/syslib/mpc85xx_devices.c b/arch/ppc/syslib/mpc85xx_devices.c index 8af322dd476a..bbc5ac0de878 100644 --- a/arch/ppc/syslib/mpc85xx_devices.c +++ b/arch/ppc/syslib/mpc85xx_devices.c | |||
| @@ -282,7 +282,7 @@ struct platform_device ppc_sys_platform_devices[] = { | |||
| 282 | }, | 282 | }, |
| 283 | [MPC85xx_DUART] = { | 283 | [MPC85xx_DUART] = { |
| 284 | .name = "serial8250", | 284 | .name = "serial8250", |
| 285 | .id = 0, | 285 | .id = PLAT8250_DEV_PLATFORM, |
| 286 | .dev.platform_data = serial_platform_data, | 286 | .dev.platform_data = serial_platform_data, |
| 287 | }, | 287 | }, |
| 288 | [MPC85xx_PERFMON] = { | 288 | [MPC85xx_PERFMON] = { |