Merge pobox.com:/garz/repo/netdev-2.6/iomap

into pobox.com:/garz/repo/net-drivers-2.6

Merge pobox.com:/garz/repo/netdev-2.6/iomap
into pobox.com:/garz/repo/net-drivers-2.6
18f955ce · Jeff Garzik · 6cae1f24 · d47490e2 · 18f955ce · 18f955ce
Commit 18f955ce authored Jan 06, 2005 by Jeff Garzik
Expand all Show whitespace changes
Inline Side-by-side

Showing with 130 additions and 173 deletions

drivers/net/Kconfig drivers/net/Kconfig +0 -10

drivers/net/eepro100.c drivers/net/eepro100.c +130 -163

No files found.
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1399,16 +1399,6 @@ config EEPRO100
 	  will be called eepro100.
-config EEPRO100_PIO
-	bool "Use PIO instead of MMIO" if !X86_VISWS
-	depends on EEPRO100
-	default y if X86_VISWS
-	help
-	  This instructs the driver to use programmed I/O ports (PIO) instead
-	  of PCI shared memory (MMIO).  This can possibly solve some problems
-	  in case your mainboard has memory consistency issues.  If unsure,
-	  say N.
 config E100
 	tristate "Intel(R) PRO/100+ support"
 	depends on NET_PCI && PCI

--- a/drivers/net/eepro100.c
+++ b/drivers/net/eepro100.c