diff options
| author | Greg KH <gregkh@suse.de> | 2005-09-09 17:26:01 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-09 17:26:01 -0400 |
| commit | 8ccc457722ba226ea72fca6f9ba3b54535d4749e (patch) | |
| tree | e323eda3b7ed55a5398751021e8031c1cae56f9d /arch/arm/mach-rpc/riscpc.c | |
| parent | 20dd026d7f5a6972dc78b4928a99620001fa547d (diff) | |
| parent | 5dce225bd9ea60e28e17076de63df0dee51b2883 (diff) | |
Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-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 | }, |