diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/platforms/44x/Kconfig | 3 | ||||
-rw-r--r-- | arch/powerpc/platforms/cell/Kconfig | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig index 1b3e008fd148..8e66949e7c67 100644 --- a/arch/powerpc/platforms/44x/Kconfig +++ b/arch/powerpc/platforms/44x/Kconfig | |||
@@ -38,8 +38,7 @@ config 440EP | |||
38 | 38 | ||
39 | config 440GP | 39 | config 440GP |
40 | bool | 40 | bool |
41 | # Disabled until the new EMAC Driver is merged. | 41 | select IBM_NEW_EMAC_ZMII |
42 | # select IBM_NEW_EMAC_ZMII | ||
43 | 42 | ||
44 | config 440GX | 43 | config 440GX |
45 | bool | 44 | bool |
diff --git a/arch/powerpc/platforms/cell/Kconfig b/arch/powerpc/platforms/cell/Kconfig index ac8032034fb8..e1e2f6a43019 100644 --- a/arch/powerpc/platforms/cell/Kconfig +++ b/arch/powerpc/platforms/cell/Kconfig | |||
@@ -10,6 +10,10 @@ config PPC_CELL_NATIVE | |||
10 | select PPC_INDIRECT_IO | 10 | select PPC_INDIRECT_IO |
11 | select PPC_NATIVE | 11 | select PPC_NATIVE |
12 | select MPIC | 12 | select MPIC |
13 | select IBM_NEW_EMAC_EMAC4 | ||
14 | select IBM_NEW_EMAC_RGMII | ||
15 | select IBM_NEW_EMAC_ZMII #test only | ||
16 | select IBM_NEW_EMAC_TAH #test only | ||
13 | default n | 17 | default n |
14 | 18 | ||
15 | config PPC_IBM_CELL_BLADE | 19 | config PPC_IBM_CELL_BLADE |