diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 18:11:04 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 18:11:04 -0400 |
| commit | e6bee325e49f17c65c1fd66e9e8b348c85788341 (patch) | |
| tree | bcc9e5d8e82efa9009edd481a837cc3626360091 /arch/m68k | |
| parent | a5e6b135bdff649e4330f98e2e80dbb1984f7e77 (diff) | |
| parent | 6ae705b23be8da52d3163be9d81e9b767876aaf9 (diff) | |
Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
* 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (76 commits)
pch_uart: reference clock on CM-iTC
pch_phub: add new device ML7213
n_gsm: fix UIH control byte : P bit should be 0
n_gsm: add a documentation
serial: msm_serial_hs: Add MSM high speed UART driver
tty_audit: fix tty_audit_add_data live lock on audit disabled
tty: move cd1865.h to drivers/staging/tty/
Staging: tty: fix build with epca.c driver
pcmcia: synclink_cs: fix prototype for mgslpc_ioctl()
Staging: generic_serial: fix double locking bug
nozomi: don't use flush_scheduled_work()
tty/serial: Relax the device_type restriction from of_serial
MAINTAINERS: Update HVC file patterns
tty: phase out of ioctl file pointer for tty3270 as well
tty: forgot to remove ipwireless from drivers/char/pcmcia/Makefile
pch_uart: Fix DMA channel miss-setting issue.
pch_uart: fix exclusive access issue
pch_uart: fix auto flow control miss-setting issue
pch_uart: fix uart clock setting issue
pch_uart : Use dev_xxx not pr_xxx
...
Fix up trivial conflicts in drivers/misc/pch_phub.c (same patch applied
twice, then changes to the same area in one branch)
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/Kconfig | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index bc9271b85759..a85e251c411f 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig | |||
| @@ -554,14 +554,6 @@ config MVME147_SCC | |||
| 554 | This is the driver for the serial ports on the Motorola MVME147 | 554 | This is the driver for the serial ports on the Motorola MVME147 |
| 555 | boards. Everyone using one of these boards should say Y here. | 555 | boards. Everyone using one of these boards should say Y here. |
| 556 | 556 | ||
| 557 | config SERIAL167 | ||
| 558 | bool "CD2401 support for MVME166/7 serial ports" | ||
| 559 | depends on MVME16x | ||
| 560 | help | ||
| 561 | This is the driver for the serial ports on the Motorola MVME166, | ||
| 562 | 167, and 172 boards. Everyone using one of these boards should say | ||
| 563 | Y here. | ||
| 564 | |||
| 565 | config MVME162_SCC | 557 | config MVME162_SCC |
| 566 | bool "SCC support for MVME162 serial ports" | 558 | bool "SCC support for MVME162 serial ports" |
| 567 | depends on MVME16x && BROKEN | 559 | depends on MVME16x && BROKEN |