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/arm/mach-omap1/serial.c | |
| parent | 63068465fa9ba8258e341f70c07cd2221b8c114d (diff) | |
| parent | 6df29debb7fc04ac3f92038c57437f40bab4e72d (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'arch/arm/mach-omap1/serial.c')
| -rw-r--r-- | arch/arm/mach-omap1/serial.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/serial.c b/arch/arm/mach-omap1/serial.c index e702e0cb899e..40c4f7c40e73 100644 --- a/arch/arm/mach-omap1/serial.c +++ b/arch/arm/mach-omap1/serial.c | |||
| @@ -98,7 +98,7 @@ static struct plat_serial8250_port serial_platform_data[] = { | |||
| 98 | 98 | ||
| 99 | static struct platform_device serial_device = { | 99 | static struct platform_device serial_device = { |
| 100 | .name = "serial8250", | 100 | .name = "serial8250", |
| 101 | .id = 0, | 101 | .id = PLAT8250_DEV_PLATFORM, |
| 102 | .dev = { | 102 | .dev = { |
| 103 | .platform_data = serial_platform_data, | 103 | .platform_data = serial_platform_data, |
| 104 | }, | 104 | }, |