Merge remote-tracking branch 'm68k-current/for-linus'

diff --combined drivers/parport/Kconfig
index a50576081b34dd998fbbd8aca4fd0c154df5420e,78e2098adcf31d4adf2bba697a6caf2f7b998348..dc82ef096f3ba61267484057b083caed92748d5b
--- 1/drivers/parport/Kconfig
--- 2/drivers/parport/Kconfig
+++ b/drivers/parport/Kconfig
@@@ -36,7 -36,9 +36,9 @@@ if PARPOR
  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
@@@ -71,7 -73,7 +73,7 @@@ config PARPORT_PC_FIF
  
  config PARPORT_PC_SUPERIO
        bool "SuperIO chipset support"
 -      depends on PARPORT_PC
 +      depends on PARPORT_PC && !PARISC
        help
          Saying Y here enables some probes for Super-IO chipsets in order to
          find out things like base addresses, IRQ lines and DMA channels.  It