diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-20 17:49:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-20 17:49:45 -0400 |
| commit | eef11427edcb821b63920219f89379fab84198b9 (patch) | |
| tree | 6a2863d3b2794958e30742bfb073a38e475989ae | |
| parent | c9ab09710ecb071031b0a04f3f9d7e686c0a75e0 (diff) | |
| parent | 14228a49913850493c7f9eb4501438c32da353f7 (diff) | |
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
| -rw-r--r-- | drivers/parport/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parport/Kconfig b/drivers/parport/Kconfig index f63c387976cf..6c8452ede0e1 100644 --- a/drivers/parport/Kconfig +++ b/drivers/parport/Kconfig | |||
| @@ -48,7 +48,7 @@ config PARPORT_PC | |||
| 48 | 48 | ||
| 49 | config PARPORT_SERIAL | 49 | config PARPORT_SERIAL |
| 50 | tristate "Multi-IO cards (parallel and serial)" | 50 | tristate "Multi-IO cards (parallel and serial)" |
| 51 | depends on SERIAL_8250 && PARPORT_PC && PCI | 51 | depends on SERIAL_8250_PCI && PARPORT_PC && PCI |
| 52 | help | 52 | help |
| 53 | This adds support for multi-IO PCI cards that have parallel and | 53 | This adds support for multi-IO PCI cards that have parallel and |
| 54 | serial ports. You should say Y or M here. If you say M, the module | 54 | serial ports. You should say Y or M here. If you say M, the module |