Skip to content

L
linux-davinci
Commit eef11427 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge master.kernel.org:/home/rmk/linux-2.6-serial 

* master.kernel.org:/home/rmk/linux-2.6-serial:
  [SERIAL] PARPORT_SERIAL should depend on SERIAL_8250_PCI
parents c9ab0971 14228a49
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
drivers/parport/Kconfig
View file @ eef11427
...@@ -48,7 +48,7 @@ config PARPORT_PC ...@@ -48,7 +48,7 @@ config PARPORT_PC
config PARPORT_SERIAL config PARPORT_SERIAL
tristate "Multi-IO cards (parallel and serial)" tristate "Multi-IO cards (parallel and serial)"
depends on SERIAL_8250 && PARPORT_PC && PCI depends on SERIAL_8250_PCI && PARPORT_PC && PCI
help help
This adds support for multi-IO PCI cards that have parallel and This adds support for multi-IO PCI cards that have parallel and
serial ports. You should say Y or M here. If you say M, the module serial ports. You should say Y or M here. If you say M, the module
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment