Commit 9847cdd9 authored by Maximilian Attems's avatar Maximilian Attems Committed by Linus Torvalds

[PATCH] compile fix 3c59x for eisa without pci

 # CONFIG_PCI is not set
 CONFIG_EISA=y

drivers/net/3c59x.c: In function `vortex_ioctl':
drivers/net/3c59x.c:2916: warning: dereferencing `void *' pointer
drivers/net/3c59x.c:2916: error: request for member `current_state' in something not a structure or union
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 63792bbd
...@@ -902,7 +902,9 @@ static void dump_tx_ring(struct net_device *dev); ...@@ -902,7 +902,9 @@ static void dump_tx_ring(struct net_device *dev);
static void update_stats(long ioaddr, struct net_device *dev); static void update_stats(long ioaddr, struct net_device *dev);
static struct net_device_stats *vortex_get_stats(struct net_device *dev); static struct net_device_stats *vortex_get_stats(struct net_device *dev);
static void set_rx_mode(struct net_device *dev); static void set_rx_mode(struct net_device *dev);
#ifdef CONFIG_PCI
static int vortex_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); static int vortex_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
#endif
static void vortex_tx_timeout(struct net_device *dev); static void vortex_tx_timeout(struct net_device *dev);
static void acpi_set_WOL(struct net_device *dev); static void acpi_set_WOL(struct net_device *dev);
static struct ethtool_ops vortex_ethtool_ops; static struct ethtool_ops vortex_ethtool_ops;
...@@ -1473,7 +1475,9 @@ static int __devinit vortex_probe1(struct device *gendev, ...@@ -1473,7 +1475,9 @@ static int __devinit vortex_probe1(struct device *gendev,
dev->stop = vortex_close; dev->stop = vortex_close;
dev->get_stats = vortex_get_stats; dev->get_stats = vortex_get_stats;
#ifdef CONFIG_PCI
dev->do_ioctl = vortex_ioctl; dev->do_ioctl = vortex_ioctl;
#endif
dev->ethtool_ops = &vortex_ethtool_ops; dev->ethtool_ops = &vortex_ethtool_ops;
dev->set_multicast_list = set_rx_mode; dev->set_multicast_list = set_rx_mode;
dev->tx_timeout = vortex_tx_timeout; dev->tx_timeout = vortex_tx_timeout;
...@@ -2880,6 +2884,7 @@ static struct ethtool_ops vortex_ethtool_ops = { ...@@ -2880,6 +2884,7 @@ static struct ethtool_ops vortex_ethtool_ops = {
.get_drvinfo = vortex_get_drvinfo, .get_drvinfo = vortex_get_drvinfo,
}; };
#ifdef CONFIG_PCI
static int vortex_do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) static int vortex_do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
{ {
struct vortex_private *vp = netdev_priv(dev); struct vortex_private *vp = netdev_priv(dev);
...@@ -2937,6 +2942,7 @@ static int vortex_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) ...@@ -2937,6 +2942,7 @@ static int vortex_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
return err; return err;
} }
#endif
/* Pre-Cyclone chips have no documented multicast filter, so the only /* Pre-Cyclone chips have no documented multicast filter, so the only
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment