Title: [4182] trunk: finish removing remnants of old BF537_PORT_H option
- Revision
- 4182
- Author
- vapier
- Date
- 2008-01-30 13:54:40 -0600 (Wed, 30 Jan 2008)
Log Message
finish removing remnants of old BF537_PORT_H option
Diffstat
arch/blackfin/mach-bf537/head.S | 12 ------------
drivers/net/Kconfig | 2 +-
2 files changed, 1 insertion(+), 13 deletions(-)
Modified Paths
Diff
Modified: trunk/arch/blackfin/mach-bf537/head.S (4181 => 4182)
--- trunk/arch/blackfin/mach-bf537/head.S 2008-01-30 18:54:52 UTC (rev 4181)
+++ trunk/arch/blackfin/mach-bf537/head.S 2008-01-30 19:54:40 UTC (rev 4182)
@@ -180,18 +180,6 @@
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);
Modified: trunk/drivers/net/Kconfig (4181 => 4182)
--- trunk/drivers/net/Kconfig 2008-01-30 18:54:52 UTC (rev 4181)
+++ trunk/drivers/net/Kconfig 2008-01-30 19:54:40 UTC (rev 4182)
@@ -838,7 +838,7 @@
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
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
http://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
