]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
CONFIG_PARPORT_SERIAL Kconfig fix from Russell King
authorChris Wright <chrisw@sous-sol.org>
Mon, 19 Jun 2006 18:31:37 +0000 (11:31 -0700)
committerChris Wright <chrisw@sous-sol.org>
Mon, 19 Jun 2006 18:31:37 +0000 (11:31 -0700)
queue-2.6.16/serial-parport_serial-should-depend-on-serial_8250_pci.patch [new file with mode: 0644]
queue-2.6.16/series

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 (file)
index 0000000..a891425
--- /dev/null
@@ -0,0 +1,27 @@
+Date:  Sun, 18 Jun 2006 13:05:43 +0100
+From:  Russell King <rmk+lkml@arm.linux.org.uk>
+To:    Andrey Borzenkov <arvidjaar@mail.ru>
+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 <chrisw@sous-sol.org>
+---
+
+ 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
index 3e9419c7cb552246284c59339ca97b93d6fd7456..b729df0eb97d8e913614ec803882f9a05603612f 100644 (file)
@@ -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