projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/home/rmk/linux-2.6-arm
[powerpc.git]
/
drivers
/
serial
/
Kconfig
diff --git
a/drivers/serial/Kconfig
b/drivers/serial/Kconfig
index
d579761
..
b745a1b
100644
(file)
--- a/
drivers/serial/Kconfig
+++ b/
drivers/serial/Kconfig
@@
-80,7
+80,7
@@
config SERIAL_8250_CS
config SERIAL_8250_ACPI
bool "8250/16550 device discovery via ACPI namespace"
default y if IA64
config SERIAL_8250_ACPI
bool "8250/16550 device discovery via ACPI namespace"
default y if IA64
- depends on ACPI
_BUS
&& SERIAL_8250
+ depends on ACPI && SERIAL_8250
---help---
If you wish to enable serial port discovery via the ACPI
namespace, say Y here. If unsure, say N.
---help---
If you wish to enable serial port discovery via the ACPI
namespace, say Y here. If unsure, say N.
@@
-308,7
+308,7
@@
config SERIAL_S3C2410_CONSOLE
config SERIAL_DZ
bool "DECstation DZ serial driver"
config SERIAL_DZ
bool "DECstation DZ serial driver"
- depends on MACH_DECSTATION &&
MIPS32
+ depends on MACH_DECSTATION &&
32BIT
select SERIAL_CORE
help
DZ11-family serial controllers for VAXstations, including the
select SERIAL_CORE
help
DZ11-family serial controllers for VAXstations, including the
@@
-830,7
+830,7
@@
config SERIAL_M32R_PLDSIO
config SERIAL_TXX9
bool "TMPTX39XX/49XX SIO support"
config SERIAL_TXX9
bool "TMPTX39XX/49XX SIO support"
- depends HAS_TXX9_SERIAL
+ depends HAS_TXX9_SERIAL
&& BROKEN
select SERIAL_CORE
default y
select SERIAL_CORE
default y