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 /drivers/serial/8250_hub6.c | |
| parent | 63068465fa9ba8258e341f70c07cd2221b8c114d (diff) | |
| parent | 6df29debb7fc04ac3f92038c57437f40bab4e72d (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'drivers/serial/8250_hub6.c')
| -rw-r--r-- | drivers/serial/8250_hub6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/8250_hub6.c b/drivers/serial/8250_hub6.c index 77f396f84b4c..daf569cd3c8f 100644 --- a/drivers/serial/8250_hub6.c +++ b/drivers/serial/8250_hub6.c | |||
| @@ -40,7 +40,7 @@ static struct plat_serial8250_port hub6_data[] = { | |||
| 40 | 40 | ||
| 41 | static struct platform_device hub6_device = { | 41 | static struct platform_device hub6_device = { |
| 42 | .name = "serial8250", | 42 | .name = "serial8250", |
| 43 | .id = 4, | 43 | .id = PLAT8250_DEV_HUB6, |
| 44 | .dev = { | 44 | .dev = { |
| 45 | .platform_data = hub6_data, | 45 | .platform_data = hub6_data, |
| 46 | }, | 46 | }, |