diff options
| author | H. Nikolaus Schaller <hns@goldelico.com> | 2013-09-14 13:43:08 +0200 |
|---|---|---|
| committer | H. Nikolaus Schaller <hns@goldelico.com> | 2013-09-14 13:43:08 +0200 |
| commit | fc342c6b0b0f468a3864d3c8902ed8e31762e866 (patch) | |
| tree | b061713ed8052960768b07667e52c0be6e16e674 /drivers/tty | |
| parent | 1bf07d164fcf5553d98a737b0e0caad208ab51e4 (diff) | |
| parent | 3711d86a2de17e967b576af8b8a1e9351a7d1466 (diff) | |
| download | kernel_goldelico_gta04-fc342c6b0b0f468a3864d3c8902ed8e31762e866.zip kernel_goldelico_gta04-fc342c6b0b0f468a3864d3c8902ed8e31762e866.tar.gz kernel_goldelico_gta04-fc342c6b0b0f468a3864d3c8902ed8e31762e866.tar.bz2 | |
Merge remote-tracking branch 'linus/master' into 3.12-wip
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig index 47c6e7b..febd45c 100644 --- a/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig @@ -5,7 +5,7 @@ if TTY menu "Serial drivers" - depends on HAS_IOMEM && GENERIC_HARDIRQS + depends on HAS_IOMEM source "drivers/tty/serial/8250/Kconfig" |