diff options
| author | Anton Altaparmakov <aia21@hera.kernel.org> | 2005-09-09 11:19:10 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@hera.kernel.org> | 2005-09-09 11:19:10 -0400 |
| commit | ddcc95963449d028b16d9b9fe50f6e91ce7d9e81 (patch) | |
| tree | aaf0392346a18b3e232ddeb5db3c4e917f7ca686 /arch/arm/mach-rpc/riscpc.c | |
| parent | 223176bc722a7bf519904180e956292ae1d1e819 (diff) | |
| parent | 5f5024130287a9467a41b9f94ec170958ae45cbd (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/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 | }, |