diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-23 04:51:46 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-23 04:51:46 +0200 |
| commit | dbe1ab9514c231c9b062140a107d9dea0eabefcc (patch) | |
| tree | 0001c7143cf923fc704215f0a0e54221e9e5cbb9 /drivers/parport/Kconfig | |
| parent | [PATCH] s2io: netpoll support (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6 (diff) | |
| download | linux-dbe1ab9514c231c9b062140a107d9dea0eabefcc.tar.xz linux-dbe1ab9514c231c9b062140a107d9dea0eabefcc.zip | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/parport/Kconfig')
| -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 config PARPORT_SERIAL tristate "Multi-IO cards (parallel and serial)" - depends on SERIAL_8250 && PARPORT_PC && PCI + depends on SERIAL_8250_PCI && PARPORT_PC && PCI help 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 |