Browse Source

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
Linus Torvalds 19 years ago
parent
commit
eef11427ed
1 changed files with 1 additions and 1 deletions
  1. 1 1
      drivers/parport/Kconfig

+ 1 - 1
drivers/parport/Kconfig

@@ -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