diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-31 03:17:34 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-31 03:17:34 -0400 |
| commit | a1744d3bee19d3b9cbfb825ab316a101b9c9f109 (patch) | |
| tree | c0e2324c09beca0eb5782eb5abf241ea2b7a4a11 /drivers/serial/Kconfig | |
| parent | 275f165fa970174f8a98205529750e8abb6c0a33 (diff) | |
| parent | a432226614c5616e3cfd211e0acffa0acfb4770c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/p54/p54common.c
Diffstat (limited to 'drivers/serial/Kconfig')
| -rw-r--r-- | drivers/serial/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index c94d3c4b7521..579d63a81aa2 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig | |||
| @@ -1276,7 +1276,7 @@ config SERIAL_SGI_IOC3 | |||
| 1276 | say Y or M. Otherwise, say N. | 1276 | say Y or M. Otherwise, say N. |
| 1277 | 1277 | ||
| 1278 | config SERIAL_NETX | 1278 | config SERIAL_NETX |
| 1279 | bool "NetX serial port support" | 1279 | tristate "NetX serial port support" |
| 1280 | depends on ARM && ARCH_NETX | 1280 | depends on ARM && ARCH_NETX |
| 1281 | select SERIAL_CORE | 1281 | select SERIAL_CORE |
| 1282 | help | 1282 | help |
| @@ -1288,7 +1288,7 @@ config SERIAL_NETX | |||
| 1288 | 1288 | ||
| 1289 | config SERIAL_NETX_CONSOLE | 1289 | config SERIAL_NETX_CONSOLE |
| 1290 | bool "Console on NetX serial port" | 1290 | bool "Console on NetX serial port" |
| 1291 | depends on SERIAL_NETX | 1291 | depends on SERIAL_NETX=y |
| 1292 | select SERIAL_CORE_CONSOLE | 1292 | select SERIAL_CORE_CONSOLE |
| 1293 | help | 1293 | help |
| 1294 | If you have enabled the serial port on the Hilscher NetX SoC | 1294 | If you have enabled the serial port on the Hilscher NetX SoC |