From: Thierry Reding <treding@nvidia.com>
Date: Fri, 25 Oct 2013 09:20:05 +0000 (+0200)
Subject: Merge remote-tracking branch 'h8300-remove/h8300-remove'
X-Git-Tag: next-20131025~103
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a6fa9cbdd410b84a84b9e6fd975d0b3aae09b206;p=karo-tx-linux.git

Merge remote-tracking branch 'h8300-remove/h8300-remove'

Conflicts:
	drivers/parport/Kconfig
---

a6fa9cbdd410b84a84b9e6fd975d0b3aae09b206
diff --cc drivers/parport/Kconfig
index f5366850af7a,dc82ef096f3b..2225237ff63f
--- a/drivers/parport/Kconfig
+++ b/drivers/parport/Kconfig
@@@ -41,8 -35,10 +41,7 @@@ if PARPOR
  
  config PARPORT_PC
  	tristate "PC-style hardware"
 -	depends on (!SPARC64 || PCI) && !SPARC32 && !M32R && !FRV && !S390 && \
 -		(!M68K || ISA) && !MN10300 && !AVR32 && !BLACKFIN && \
 -		!XTENSA && !CRIS
 -
 +	depends on ARCH_MIGHT_HAVE_PC_PARPORT
- 
  	---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