# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/09/17 23:44:56+02:00 lists@kenneth.aafloy.net(none) 
#   via-rhine.c:
#     [via-rhine] Disable the D3 power state in _shutdown.
# 
# drivers/net/via-rhine.c
#   2004/09/17 23:29:58+02:00 lists@kenneth.aafloy.net(none) +3 -1
#   [via-rhine] Disable the D3 power state in _shutdown.
# 
diff -Nru a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c
--- a/drivers/net/via-rhine.c	2004-09-17 23:49:38 +02:00
+++ b/drivers/net/via-rhine.c	2004-09-17 23:49:38 +02:00
@@ -1934,7 +1934,9 @@
 	writeb(readb(ioaddr + StickyHW) | 0x04, ioaddr + StickyHW);
 
 	/* Hit power state D3 (sleep) */
-	writeb(readb(ioaddr + StickyHW) | 0x03, ioaddr + StickyHW);
+	/* Disabled for now, because it will confuse the PXE boot rom
+	 * of some Via Epia boards. */
+	//writeb(readb(ioaddr + StickyHW) | 0x03, ioaddr + StickyHW);
 
 	/* TODO: Check use of pci_enable_wake() */