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/board-voiceblue.c | |
| parent | 63068465fa9ba8258e341f70c07cd2221b8c114d (diff) | |
| parent | 6df29debb7fc04ac3f92038c57437f40bab4e72d (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'arch/arm/mach-omap1/board-voiceblue.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-voiceblue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c index 209d79ef1d5f..bf30b1acda0b 100644 --- a/arch/arm/mach-omap1/board-voiceblue.c +++ b/arch/arm/mach-omap1/board-voiceblue.c | |||
| @@ -75,7 +75,7 @@ static struct plat_serial8250_port voiceblue_ports[] = { | |||
| 75 | 75 | ||
| 76 | static struct platform_device serial_device = { | 76 | static struct platform_device serial_device = { |
| 77 | .name = "serial8250", | 77 | .name = "serial8250", |
| 78 | .id = 1, | 78 | .id = PLAT8250_DEV_PLATFORM1, |
| 79 | .dev = { | 79 | .dev = { |
| 80 | .platform_data = voiceblue_ports, | 80 | .platform_data = voiceblue_ports, |
| 81 | }, | 81 | }, |