From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 12 Nov 2013 05:13:14 +0000 (+0900)
Subject: Merge tag 'h8300-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4b4d2b463461f1b86fd89353184e6f2938e7566b;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge tag 'h8300-for-linus' of git://git./linux/kernel/git/groeck/linux-staging

Pull h8300 platform removal from Guenter Roeck:
 "The patch series has been in -next for more than one relase cycle.  I
  did get a number of Acks, and no objections.

  H8/300 has been dead for several years, the kernel for it has not
  compiled for ages, and recent versions of gcc for it are broken.
  Remove support for it"

* tag 'h8300-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  CREDITS: Add Yoshinori Sato for h8300
  fs/minix: Drop dependency on H8300
  Drop remaining references to H8/300 architecture
  Drop MAINTAINERS entry for H8/300
  watchdog: Drop references to H8300 architecture
  net/ethernet: Drop H8/300 Ethernet driver
  net/ethernet: smsc9194: Drop conditional code for H8/300
  ide: Drop H8/300 driver
  Drop support for Renesas H8/300 (h8300) architecture
---

4b4d2b463461f1b86fd89353184e6f2938e7566b
diff --cc drivers/parport/Kconfig
index 70694ce38be2,70694ce38be2..dc82ef096f3b
--- a/drivers/parport/Kconfig
+++ b/drivers/parport/Kconfig
@@@ -37,7 -37,7 +37,7 @@@ config PARPORT_P
  	tristate "PC-style hardware"
  	depends on (!SPARC64 || PCI) && !SPARC32 && !M32R && !FRV && !S390 && \
  		(!M68K || ISA) && !MN10300 && !AVR32 && !BLACKFIN && \
--		!XTENSA && !CRIS && !H8300
++		!XTENSA && !CRIS
  
  	---help---
  	  You should say Y here if you have a PC-style parallel port. All