diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
| commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
| tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /drivers/serial/Kconfig | |
| parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge linux-2.6 with linux-acpi-2.6
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 db8f39c30096..b745a1b9e835 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig | |||
| @@ -308,7 +308,7 @@ config SERIAL_S3C2410_CONSOLE | |||
| 308 | 308 | ||
| 309 | config SERIAL_DZ | 309 | config SERIAL_DZ |
| 310 | bool "DECstation DZ serial driver" | 310 | bool "DECstation DZ serial driver" |
| 311 | depends on MACH_DECSTATION && MIPS32 | 311 | depends on MACH_DECSTATION && 32BIT |
| 312 | select SERIAL_CORE | 312 | select SERIAL_CORE |
| 313 | help | 313 | help |
| 314 | DZ11-family serial controllers for VAXstations, including the | 314 | DZ11-family serial controllers for VAXstations, including the |