From: Chris Wright Date: Mon, 19 Jun 2006 18:31:37 +0000 (-0700) Subject: CONFIG_PARPORT_SERIAL Kconfig fix from Russell King X-Git-Tag: v2.6.16.21~16 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3c980289fe99ef1eb509d6a3d8cac7be257ac0c8;p=thirdparty%2Fkernel%2Fstable-queue.git CONFIG_PARPORT_SERIAL Kconfig fix from Russell King --- diff --git a/queue-2.6.16/serial-parport_serial-should-depend-on-serial_8250_pci.patch b/queue-2.6.16/serial-parport_serial-should-depend-on-serial_8250_pci.patch new file mode 100644 index 00000000000..a8914259f1f --- /dev/null +++ b/queue-2.6.16/serial-parport_serial-should-depend-on-serial_8250_pci.patch @@ -0,0 +1,27 @@ +Date: Sun, 18 Jun 2006 13:05:43 +0100 +From: Russell King +To: Andrey Borzenkov +Subject: SERIAL: PARPORT_SERIAL should depend on SERIAL_8250_PCI + +Since parport_serial uses symbols from 8250_pci, there should +be a dependency between the configuration symbols for these +two modules. Problem reported by Andrey Borzenkov + +Signed-off-by: Russell King +Signed-off-by: Chris Wright +--- + + drivers/parport/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- linux-2.6.16.20.orig/drivers/parport/Kconfig ++++ linux-2.6.16.20/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 diff --git a/queue-2.6.16/series b/queue-2.6.16/series index 3e9419c7cb5..b729df0eb97 100644 --- a/queue-2.6.16/series +++ b/queue-2.6.16/series @@ -4,3 +4,4 @@ sparc64-respect-gfp_t-argument-to-dma_alloc_coherent.patch sparc64-fix-missing-fold-at-end-of-checksums.patch missed-error-checking-for-intent-s-filp-in-open_namei.patch tmpfs-time-granularity-fix-for-time-going-backwards.patch +serial-parport_serial-should-depend-on-serial_8250_pci.patch