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/pxa.c | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'drivers/serial/pxa.c')
| -rw-r--r-- | drivers/serial/pxa.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c index ae3649568541..0fa0ccc9ed27 100644 --- a/drivers/serial/pxa.c +++ b/drivers/serial/pxa.c | |||
| @@ -780,7 +780,6 @@ static struct uart_pxa_port serial_pxa_ports[] = { | |||
| 780 | static struct uart_driver serial_pxa_reg = { | 780 | static struct uart_driver serial_pxa_reg = { |
| 781 | .owner = THIS_MODULE, | 781 | .owner = THIS_MODULE, |
| 782 | .driver_name = "PXA serial", | 782 | .driver_name = "PXA serial", |
| 783 | .devfs_name = "tts/", | ||
| 784 | .dev_name = "ttyS", | 783 | .dev_name = "ttyS", |
| 785 | .major = TTY_MAJOR, | 784 | .major = TTY_MAJOR, |
| 786 | .minor = 64, | 785 | .minor = 64, |