Merge branch 'master' into for-next

[mirror_ubuntu-artful-kernel.git] / arch / powerpc / platforms / 40x / Kconfig

diff --git a/arch/powerpc/platforms/40x/Kconfig b/arch/powerpc/platforms/40x/Kconfig
index e568e85813ae0e9aa43bcfedba2ec92a062e4369..bd69cf8d82226e35bc48e87e5c0e34db51c45bd6 100644 (file)
--- a/arch/powerpc/platforms/40x/Kconfig
+++ b/arch/powerpc/platforms/40x/Kconfig
@@ -16,14 +16,6 @@ config EP405
        help
          This option enables support for the EP405/EP405PC boards.
 
-config HCU4
-       bool "Hcu4"
-       depends on 40x
-       default n
-       select 405GPR
-       help
-         This option enables support for the Nestal Maschinen HCU4 board.
-
 config HOTFOOT
         bool "Hotfoot"
        depends on 40x
@@ -91,11 +83,6 @@ config PPC40x_SIMPLE
        help
          This option enables the simple PowerPC 40x platform support.
 
-# 40x specific CPU modules, selected based on the board above.
-config NP405H
-       bool
-       #depends on ASH
-
 # OAK doesn't exist but wanted to keep this around for any future 403GCX boards
 config 403GCX
        bool
@@ -106,21 +93,21 @@ config 405GP
        bool
        select IBM405_ERR77
        select IBM405_ERR51
-       select IBM_NEW_EMAC_ZMII
+       select IBM_EMAC_ZMII
 
 config 405EP
        bool
 
 config 405EX
        bool
-       select IBM_NEW_EMAC_EMAC4
-       select IBM_NEW_EMAC_RGMII
+       select IBM_EMAC_EMAC4
+       select IBM_EMAC_RGMII
 
 config 405EZ
        bool
-       select IBM_NEW_EMAC_NO_FLOW_CTRL
-       select IBM_NEW_EMAC_MAL_CLR_ICINTSTAT
-       select IBM_NEW_EMAC_MAL_COMMON_ERR
+       select IBM_EMAC_NO_FLOW_CTRL
+       select IBM_EMAC_MAL_CLR_ICINTSTAT
+       select IBM_EMAC_MAL_COMMON_ERR
 
 config 405GPR
        bool