[Blackfin] arch: finish removing remnants of old BF537_PORT_H option of Blackfin EMAC driver

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Acked-by: Jeff Garzik <jeff@garzik.org>

2 files changed, 1 insertions, 13 deletions

diff --git a/arch/blackfin/mach-bf537/head.S b/arch/blackfin/mach-bf537/head.S
index 3014fe8dd155..ac85fdfbfd01 100644
--- a/arch/blackfin/mach-bf537/head.S
+++ b/arch/blackfin/mach-bf537/head.S
@@ -180,18 +180,6 @@ ENTRY(__start)
         SSYNC;
 #endif
 
-#ifdef CONFIG_BF537_PORT_H
-        p0.h = hi(PORTH_FER);
-        p0.l = lo(PORTH_FER);
-        R0.L = W[P0]; /* Read */
-        SSYNC;
-        R0 = 0x0000;
-        W[P0] = R0.L; /* Write */
-        SSYNC;
-        W[P0] = R0.L; /* Disable peripheral function of PORTH */
-        SSYNC;
-#endif
-
         /* Initialise UART - when booting from u-boot, the UART is not disabled
          * so if we dont initalize here, our serial console gets hosed */
         p0.h = hi(UART_LCR);
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 2399a3796f6e..015e16325973 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -827,7 +827,7 @@ config ULTRA32
 
 config BFIN_MAC
         tristate "Blackfin 527/536/537 on-chip mac support"
-        depends on NET_ETHERNET && (BF527 || BF537 || BF536) && (!BF537_PORT_H)
+        depends on NET_ETHERNET && (BF527 || BF537 || BF536)
         select CRC32
         select MII
         select PHYLIB