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-ixp2000 | |
| parent | 1d6ae775d7a948c9575658eb41184fd2e506c0df (diff) | |
| parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/arm/mach-ixp2000')
| -rw-r--r-- | arch/arm/mach-ixp2000/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp2000/core.c b/arch/arm/mach-ixp2000/core.c index 098c817a7fb8..74bd2fd602d4 100644 --- a/arch/arm/mach-ixp2000/core.c +++ b/arch/arm/mach-ixp2000/core.c | |||
| @@ -174,7 +174,7 @@ static struct resource ixp2000_uart_resource = { | |||
| 174 | 174 | ||
| 175 | static struct platform_device ixp2000_serial_device = { | 175 | static struct platform_device ixp2000_serial_device = { |
| 176 | .name = "serial8250", | 176 | .name = "serial8250", |
| 177 | .id = 0, | 177 | .id = PLAT8250_DEV_PLATFORM, |
| 178 | .dev = { | 178 | .dev = { |
| 179 | .platform_data = ixp2000_serial_port, | 179 | .platform_data = ixp2000_serial_port, |
| 180 | }, | 180 | }, |