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/mpc52xx_uart.c | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'drivers/serial/mpc52xx_uart.c')
| -rw-r--r-- | drivers/serial/mpc52xx_uart.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c index 6459edc7f5c5..1aa34844218c 100644 --- a/drivers/serial/mpc52xx_uart.c +++ b/drivers/serial/mpc52xx_uart.c | |||
| @@ -693,7 +693,6 @@ static struct uart_driver mpc52xx_uart_driver = { | |||
| 693 | .owner = THIS_MODULE, | 693 | .owner = THIS_MODULE, |
| 694 | .driver_name = "mpc52xx_psc_uart", | 694 | .driver_name = "mpc52xx_psc_uart", |
| 695 | .dev_name = "ttyPSC", | 695 | .dev_name = "ttyPSC", |
| 696 | .devfs_name = "ttyPSC", | ||
| 697 | .major = SERIAL_PSC_MAJOR, | 696 | .major = SERIAL_PSC_MAJOR, |
| 698 | .minor = SERIAL_PSC_MINOR, | 697 | .minor = SERIAL_PSC_MINOR, |
| 699 | .nr = MPC52xx_PSC_MAXNUM, | 698 | .nr = MPC52xx_PSC_MAXNUM, |