diff --git a/[refs] b/[refs] index 6f31e356a87b..b72d81398e36 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5c1992f83304cf2d56934dd6c06709b96e1b0c81 +refs/heads/master: e38e3458804019c3fe9b17998e05fd1cd480806d diff --git a/trunk/arch/powerpc/platforms/44x/Kconfig b/trunk/arch/powerpc/platforms/44x/Kconfig index 8e66949e7c67..1b3e008fd148 100644 --- a/trunk/arch/powerpc/platforms/44x/Kconfig +++ b/trunk/arch/powerpc/platforms/44x/Kconfig @@ -38,7 +38,8 @@ config 440EP config 440GP bool - select IBM_NEW_EMAC_ZMII +# Disabled until the new EMAC Driver is merged. +# select IBM_NEW_EMAC_ZMII config 440GX bool