diff --git a/[refs] b/[refs]
index daf5592c39f0..a576ecae9008 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b8aa36e568178ea801fcb42a5c55de0361a6892
+refs/heads/master: 5af29f595813cce3c125d01d2500be483732ef4f
diff --git a/trunk/arch/blackfin/mach-bf537/head.S b/trunk/arch/blackfin/mach-bf537/head.S
index 3014fe8dd155..ac85fdfbfd01 100644
--- a/trunk/arch/blackfin/mach-bf537/head.S
+++ b/trunk/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/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
index 2399a3796f6e..015e16325973 100644
--- a/trunk/drivers/net/Kconfig
+++ b/trunk/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