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/v850e_uart.c | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'drivers/serial/v850e_uart.c')
| -rw-r--r-- | drivers/serial/v850e_uart.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/serial/v850e_uart.c b/drivers/serial/v850e_uart.c index df705fda4243..a0da2aaf71c4 100644 --- a/drivers/serial/v850e_uart.c +++ b/drivers/serial/v850e_uart.c | |||
| @@ -468,7 +468,6 @@ static struct uart_ops v850e_uart_ops = { | |||
| 468 | static struct uart_driver v850e_uart_driver = { | 468 | static struct uart_driver v850e_uart_driver = { |
| 469 | .owner = THIS_MODULE, | 469 | .owner = THIS_MODULE, |
| 470 | .driver_name = "v850e_uart", | 470 | .driver_name = "v850e_uart", |
| 471 | .devfs_name = "tts/", | ||
| 472 | .dev_name = "ttyS", | 471 | .dev_name = "ttyS", |
| 473 | .major = TTY_MAJOR, | 472 | .major = TTY_MAJOR, |
| 474 | .minor = V850E_UART_MINOR_BASE, | 473 | .minor = V850E_UART_MINOR_BASE, |