Subject: [PATCH 1/2] Blackfin EMAC driver: finish removing remnants of old BF537_PORT_H option

From: Bryan Wu <[email-masked]>
Date: Wed, 26 Mar 2008 18:21:57 -0700

From: Mike Frysinger <[email-masked]>

Signed-off-by: Mike Frysinger <[email-masked]>
Signed-off-by: Bryan Wu <[email-masked]>
---
 arch/blackfin/mach-bf537/head.S |   12 ------------
 drivers/net/Kconfig             |    2 +-
 2 files changed, 1 insertions(+), 13 deletions(-)

diff --git a/arch/blackfin/mach-bf537/head.S b/arch/blackfin/mach-bf537/head.S
index 3014fe8..ac85fdf 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 fe7b5ec..c52e9d8 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -820,7 +820,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
-- 
1.5.4.3