diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-26 13:06:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-26 13:06:06 -0700 |
| commit | efe45ab1ee04551936f8343bd4ca1ff02ffc23bb (patch) | |
| tree | f2bc88ccd5a01770b6a8efe3f6023068179f610b /drivers/tty/serial/max3107-aava.c | |
| parent | 3ab47029d91993745212624e49d16a75abc8f207 (diff) | |
| parent | b280a97d1caf6fe1d38b51ebb31219391f5ad1a0 (diff) | |
Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
* 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
omap-serial: Allow IXON and IXOFF to be disabled.
TTY: serial, document ignoring of uart->ops->startup error
TTY: pty, fix pty counting
8250: Fix race condition in serial8250_backup_timeout().
serial/8250_pci: delete duplicate data definition
8250_pci: add support for Rosewill RC-305 4x serial port card
tty: Add "spi:" prefix for spi modalias
atmel_serial: fix atmel_default_console_device
serial: 8250_pnp: add Intermec CV60 touchscreen device
drivers/serial/ucc_uart.c: Fix compiler warning
pch_uart: Set PCIe bus number using probe parameter
serial: samsung: Fix build error
Diffstat (limited to 'drivers/tty/serial/max3107-aava.c')
| -rw-r--r-- | drivers/tty/serial/max3107-aava.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/max3107-aava.c b/drivers/tty/serial/max3107-aava.c index a1fe304f2f52..d73aadd7a9ad 100644 --- a/drivers/tty/serial/max3107-aava.c +++ b/drivers/tty/serial/max3107-aava.c @@ -340,5 +340,5 @@ module_exit(max3107_exit); MODULE_DESCRIPTION("MAX3107 driver"); MODULE_AUTHOR("Aavamobile"); -MODULE_ALIAS("aava-max3107-spi"); +MODULE_ALIAS("spi:aava-max3107"); MODULE_LICENSE("GPL v2"); |