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/char/serial167.c | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'drivers/char/serial167.c')
| -rw-r--r-- | drivers/char/serial167.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/serial167.c b/drivers/char/serial167.c index 037c940ac71b..c851eeaa4069 100644 --- a/drivers/char/serial167.c +++ b/drivers/char/serial167.c | |||
| @@ -2235,7 +2235,6 @@ scrn[1] = '\0'; | |||
| 2235 | /* Initialize the tty_driver structure */ | 2235 | /* Initialize the tty_driver structure */ |
| 2236 | 2236 | ||
| 2237 | cy_serial_driver->owner = THIS_MODULE; | 2237 | cy_serial_driver->owner = THIS_MODULE; |
| 2238 | cy_serial_driver->devfs_name = "tts/"; | ||
| 2239 | cy_serial_driver->name = "ttyS"; | 2238 | cy_serial_driver->name = "ttyS"; |
| 2240 | cy_serial_driver->major = TTY_MAJOR; | 2239 | cy_serial_driver->major = TTY_MAJOR; |
| 2241 | cy_serial_driver->minor_start = 64; | 2240 | cy_serial_driver->minor_start = 64; |