diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 22:44:39 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 22:44:39 -0500 |
| commit | 650eec5e04468d0611a60e6098464b7c43981552 (patch) | |
| tree | dedaf6f64ced34391a085f8c1148c1cf9f593ea6 /drivers/serial/Kconfig | |
| parent | 150a631fc55e33df28a6846371e7f86e9e75e8cb (diff) | |
| parent | 7493a314cb83797ce612a577475aacaedc553fed (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'drivers/serial/Kconfig')
| -rw-r--r-- | drivers/serial/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index e0685a520514..5e7199f7b59c 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig | |||
| @@ -847,7 +847,7 @@ config SERIAL_M32R_SIO_CONSOLE | |||
| 847 | 847 | ||
| 848 | config SERIAL_M32R_PLDSIO | 848 | config SERIAL_M32R_PLDSIO |
| 849 | bool "M32R SIO I/F on a PLD" | 849 | bool "M32R SIO I/F on a PLD" |
| 850 | depends on SERIAL_M32R_SIO=y && (PLAT_OPSPUT || PALT_USRV || PLAT_M32700UT) | 850 | depends on SERIAL_M32R_SIO=y && (PLAT_OPSPUT || PLAT_USRV || PLAT_M32700UT) |
| 851 | default n | 851 | default n |
| 852 | help | 852 | help |
| 853 | Say Y here if you want to use the M32R serial controller | 853 | Say Y here if you want to use the M32R serial controller |