5 files changed, 39 insertions, 39 deletions

diff --git a/arch/powerpc/platforms/40x/Kconfig b/arch/powerpc/platforms/40x/Kconfig
index d733d7ca939..b5d87067a58 100644
--- a/arch/powerpc/platforms/40x/Kconfig
+++ b/arch/powerpc/platforms/40x/Kconfig
@@ -130,21 +130,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
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index e958b6f48ec..762322ce24a 100644
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -23,7 +23,7 @@ config BLUESTONE
         default n
         select PPC44x_SIMPLE
         select APM821xx
-        select IBM_NEW_EMAC_RGMII
+        select IBM_EMAC_RGMII
         help
           This option enables support for the APM APM821xx Evaluation board.
 
@@ -122,8 +122,8 @@ config CANYONLANDS
         select PPC4xx_PCI_EXPRESS
         select PCI_MSI
         select PPC4xx_MSI
-        select IBM_NEW_EMAC_RGMII
-        select IBM_NEW_EMAC_ZMII
+        select IBM_EMAC_RGMII
+        select IBM_EMAC_ZMII
         help
           This option enables support for the AMCC PPC460EX evaluation board.
 
@@ -135,8 +135,8 @@ config GLACIER
         select 460EX # Odd since it uses 460GT but the effects are the same
         select PCI
         select PPC4xx_PCI_EXPRESS
-        select IBM_NEW_EMAC_RGMII
-        select IBM_NEW_EMAC_ZMII
+        select IBM_EMAC_RGMII
+        select IBM_EMAC_ZMII
         help
           This option enables support for the AMCC PPC460GT evaluation board.
 
@@ -161,7 +161,7 @@ config EIGER
         select 460SX
         select PCI
         select PPC4xx_PCI_EXPRESS
-        select IBM_NEW_EMAC_RGMII
+        select IBM_EMAC_RGMII
         help
           This option enables support for the AMCC PPC460SX evaluation board.
 
@@ -260,59 +260,59 @@ config 440EP
         bool
         select PPC_FPU
         select IBM440EP_ERR42
-        select IBM_NEW_EMAC_ZMII
+        select IBM_EMAC_ZMII
         select USB_ARCH_HAS_OHCI
 
 config 440EPX
         bool
         select PPC_FPU
-        select IBM_NEW_EMAC_EMAC4
-        select IBM_NEW_EMAC_RGMII
-        select IBM_NEW_EMAC_ZMII
+        select IBM_EMAC_EMAC4
+        select IBM_EMAC_RGMII
+        select IBM_EMAC_ZMII
 
 config 440GRX
         bool
-        select IBM_NEW_EMAC_EMAC4
-        select IBM_NEW_EMAC_RGMII
-        select IBM_NEW_EMAC_ZMII
+        select IBM_EMAC_EMAC4
+        select IBM_EMAC_RGMII
+        select IBM_EMAC_ZMII
 
 config 440GP
         bool
-        select IBM_NEW_EMAC_ZMII
+        select IBM_EMAC_ZMII
 
 config 440GX
         bool
-        select IBM_NEW_EMAC_EMAC4
-        select IBM_NEW_EMAC_RGMII
-        select IBM_NEW_EMAC_ZMII #test only
-        select IBM_NEW_EMAC_TAH  #test only
+        select IBM_EMAC_EMAC4
+        select IBM_EMAC_RGMII
+        select IBM_EMAC_ZMII #test only
+        select IBM_EMAC_TAH  #test only
 
 config 440SP
         bool
 
 config 440SPe
         bool
-        select IBM_NEW_EMAC_EMAC4
+        select IBM_EMAC_EMAC4
 
 config 460EX
         bool
         select PPC_FPU
-        select IBM_NEW_EMAC_EMAC4
-        select IBM_NEW_EMAC_TAH
+        select IBM_EMAC_EMAC4
+        select IBM_EMAC_TAH
 
 config 460SX
         bool
         select PPC_FPU
-        select IBM_NEW_EMAC_EMAC4
-        select IBM_NEW_EMAC_RGMII
-        select IBM_NEW_EMAC_ZMII
-        select IBM_NEW_EMAC_TAH
+        select IBM_EMAC_EMAC4
+        select IBM_EMAC_RGMII
+        select IBM_EMAC_ZMII
+        select IBM_EMAC_TAH
 
 config APM821xx
         bool
         select PPC_FPU
-        select IBM_NEW_EMAC_EMAC4
-        select IBM_NEW_EMAC_TAH
+        select IBM_EMAC_EMAC4
+        select IBM_EMAC_TAH
 
 # 44x errata/workaround config symbols, selected by the CPU models above
 config IBM440EP_ERR42
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index 498534cd526..12f5932dadc 100644
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -80,7 +80,7 @@ config P1010_RDB
 config P1022_DS
         bool "Freescale P1022 DS"
         select DEFAULT_UIMAGE
-        select CONFIG_PHYS_64BIT        # The DTS has 36-bit addresses
+        select PHYS_64BIT       # The DTS has 36-bit addresses
         select SWIOTLB
         help
           This option enables support for the Freescale P1022DS reference board.
diff --git a/arch/powerpc/platforms/cell/Kconfig b/arch/powerpc/platforms/cell/Kconfig
index 67d5009b4e8..2e7ff0c5cf4 100644
--- a/arch/powerpc/platforms/cell/Kconfig
+++ b/arch/powerpc/platforms/cell/Kconfig
@@ -17,10 +17,10 @@ config PPC_CELL_NATIVE
         select PPC_CELL_COMMON
         select MPIC
         select PPC_IO_WORKAROUNDS
-        select IBM_NEW_EMAC_EMAC4
-        select IBM_NEW_EMAC_RGMII
-        select IBM_NEW_EMAC_ZMII #test only
-        select IBM_NEW_EMAC_TAH  #test only
+        select IBM_EMAC_EMAC4
+        select IBM_EMAC_RGMII
+        select IBM_EMAC_ZMII #test only
+        select IBM_EMAC_TAH  #test only
         default n
 
 config PPC_IBM_CELL_BLADE
diff --git a/arch/powerpc/platforms/embedded6xx/storcenter.c b/arch/powerpc/platforms/embedded6xx/storcenter.c
index 613070e9ddb..f1eebcae9bf 100644
--- a/arch/powerpc/platforms/embedded6xx/storcenter.c
+++ b/arch/powerpc/platforms/embedded6xx/storcenter.c
@@ -77,7 +77,7 @@ static void __init storcenter_setup_arch(void)
 }
 
 /*
- * Interrupt setup and service.  Interrrupts on the turbostation come
+ * Interrupt setup and service.  Interrupts on the turbostation come
  * from the four PCI slots plus onboard 8241 devices: I2C, DUART.
  */
 static void __init storcenter_init_IRQ(void)