[PATCH] Gets 3c59x to compile on non-PCI systems

[Marc Zyngier]

This is a MIME-formatted message.  If you see this text it means that your
E-mail software does not support MIME-formatted messages.

--=_courier-941-1044728802-0001-2
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: 7bit

Hi all,

My previous round of EISA hacking left the 3c59x driver unable to
compile on non-PCI systems (that is, EISA only...).

This small patch fixes it.

        M.

--=_courier-941-1044728802-0001-2
Content-Type: text/x-patch; charset=iso-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename=3c59x.patch

===== drivers/net/3c59x.c 1.23.1.5 vs 1.30 =====
--- 1.23.1.5/drivers/net/3c59x.c	Wed Jan 15 17:56:16 2003
+++ 1.30/drivers/net/3c59x.c	Sun Jan 26 20:26:07 2003
@@ -181,7 +181,7 @@
     - See http://www.zip.com.au/~akpm/linux/#3c59x-2.3 for more details.
     - Also see Documentation/networking/vortex.txt
 
-   LK1.1.19 10Nov09 Marc Zyngier <[e-mail]>
+   LK1.1.19 10Nov02 Marc Zyngier <[e-mail]>
     - EISA sysfs integration.
 */
 
@@ -817,7 +817,11 @@
 	u32 power_state[16];
 };
 
+#ifdef CONFIG_PCI
 #define DEVICE_PCI(dev) (((dev)->bus == &pci_bus_type) ? to_pci_dev((dev)) : NULL)
+#else
+#define DEVICE_PCI(dev) NULL
+#endif
 
 #define VORTEX_PCI(vp) (((vp)->gendev) ? DEVICE_PCI((vp)->gendev) : NULL)
 

--=_courier-941-1044728802-0001-2
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: 7bit

-- 
Places change, faces change. Life is so very strange.

--=_courier-941-1044728802-0001-2--