Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eef11427 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

drivers/parport/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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