diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
| commit | 905ec87e93bc9e01b15c60035cd6a50c636cbaef (patch) | |
| tree | 46fd7618d6511611ffc19eb0dd4d7bc6b90a41c2 /arch/arm/mach-rpc/riscpc.c | |
| parent | 1d6ae775d7a948c9575658eb41184fd2e506c0df (diff) | |
| parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/arm/mach-rpc/riscpc.c')
| -rw-r--r-- | arch/arm/mach-rpc/riscpc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-rpc/riscpc.c b/arch/arm/mach-rpc/riscpc.c index a10268618f74..e3587efec4bf 100644 --- a/arch/arm/mach-rpc/riscpc.c +++ b/arch/arm/mach-rpc/riscpc.c | |||
| @@ -140,7 +140,7 @@ static struct plat_serial8250_port serial_platform_data[] = { | |||
| 140 | 140 | ||
| 141 | static struct platform_device serial_device = { | 141 | static struct platform_device serial_device = { |
| 142 | .name = "serial8250", | 142 | .name = "serial8250", |
| 143 | .id = 0, | 143 | .id = PLAT8250_DEV_PLATFORM, |
| 144 | .dev = { | 144 | .dev = { |
| 145 | .platform_data = serial_platform_data, | 145 | .platform_data = serial_platform_data, |
| 146 | }, | 146 | }, |