diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
| commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
| tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /drivers/serial/m32r_sio.c | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'drivers/serial/m32r_sio.c')
| -rw-r--r-- | drivers/serial/m32r_sio.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/serial/m32r_sio.c b/drivers/serial/m32r_sio.c index 321a40f33b50..6a2a25d9b596 100644 --- a/drivers/serial/m32r_sio.c +++ b/drivers/serial/m32r_sio.c | |||
| @@ -1131,7 +1131,6 @@ console_initcall(m32r_sio_console_init); | |||
| 1131 | static struct uart_driver m32r_sio_reg = { | 1131 | static struct uart_driver m32r_sio_reg = { |
| 1132 | .owner = THIS_MODULE, | 1132 | .owner = THIS_MODULE, |
| 1133 | .driver_name = "sio", | 1133 | .driver_name = "sio", |
| 1134 | .devfs_name = "tts/", | ||
| 1135 | .dev_name = "ttyS", | 1134 | .dev_name = "ttyS", |
| 1136 | .major = TTY_MAJOR, | 1135 | .major = TTY_MAJOR, |
| 1137 | .minor = 64, | 1136 | .minor = 64, |