Patch "parport: disable PC-style parallel port support on cris" has been added to the 3.10-stable tree

Patch "parport: disable PC-style parallel port support on cris" has been added to the 3.10-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    parport: disable PC-style parallel port support on cris

to the 3.10-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     parport-disable-pc-style-parallel-port-support-on-cris.patch
and it can be found in the queue-3.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From cb1ff5f90e1550d5752521205506b99f1aa8b1e0 Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Wed, 15 May 2013 22:51:15 +0200
Subject: parport: disable PC-style parallel port support on cris

From: Geert Uytterhoeven <geert@linux-m68k.org>

commit cb1ff5f90e1550d5752521205506b99f1aa8b1e0 upstream.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/parport/Kconfig |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- a/drivers/parport/Kconfig
+++ b/drivers/parport/Kconfig
@@ -36,7 +36,9 @@ if PARPORT
 config PARPORT_PC
 	tristate "PC-style hardware"
 	depends on (!SPARC64 || PCI) && !SPARC32 && !M32R && !FRV && !S390 && \
-		(!M68K || ISA) && !MN10300 && !AVR32 && !BLACKFIN && !XTENSA
+		(!M68K || ISA) && !MN10300 && !AVR32 && !BLACKFIN && \
+		!XTENSA && !CRIS
+
 	---help---
 	  You should say Y here if you have a PC-style parallel port. All
 	  IBM PC compatible computers and some Alphas have PC-style


Patches currently in stable-queue which might be from geert@linux-m68k.org are

queue-3.10/console-disable-vga-text-console-support-on-cris.patch
queue-3.10/parport-disable-pc-style-parallel-port-support-on-cris.patch