diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2008-07-14 17:29:34 -0400 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2008-07-14 17:29:34 -0400 |
| commit | 2fceef397f9880b212a74c418290ce69e7ac00eb (patch) | |
| tree | d9cc09ab992825ef7fede4a688103503e3caf655 /drivers/serial/sb1250-duart.c | |
| parent | feae1ef116ed381625d3731c5ae4f4ebcb3fa302 (diff) | |
| parent | bce7f793daec3e65ec5c5705d2457b81fe7b5725 (diff) | |
Merge commit 'v2.6.26' into bkl-removal
Diffstat (limited to 'drivers/serial/sb1250-duart.c')
| -rw-r--r-- | drivers/serial/sb1250-duart.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/sb1250-duart.c b/drivers/serial/sb1250-duart.c index 2d6c08b3dbcf..f8e1447a022a 100644 --- a/drivers/serial/sb1250-duart.c +++ b/drivers/serial/sb1250-duart.c | |||
| @@ -924,7 +924,7 @@ console_initcall(sbd_serial_console_init); | |||
| 924 | 924 | ||
| 925 | static struct uart_driver sbd_reg = { | 925 | static struct uart_driver sbd_reg = { |
| 926 | .owner = THIS_MODULE, | 926 | .owner = THIS_MODULE, |
| 927 | .driver_name = "serial", | 927 | .driver_name = "sb1250_duart", |
| 928 | .dev_name = "duart", | 928 | .dev_name = "duart", |
| 929 | .major = TTY_MAJOR, | 929 | .major = TTY_MAJOR, |
| 930 | .minor = SB1250_DUART_MINOR_BASE, | 930 | .minor = SB1250_DUART_MINOR_BASE, |