diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-29 09:11:23 +0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-29 09:11:23 +0400 |
| commit | 7b7e394185014e0f3bd8989cac937003f20ef9ce (patch) | |
| tree | 3beda5f979bba0aa9822534e239cf1b45f3be69c /drivers/net/wireless/wavelan_cs.p.h | |
| parent | ddc5d3414593e4d7ad7fbd33e7f7517fcc234544 (diff) | |
| parent | 693f7d362055261882659475d2ef022e32edbff1 (diff) | |
| download | linux-7b7e394185014e0f3bd8989cac937003f20ef9ce.tar.xz | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/wireless/wavelan_cs.p.h')
| -rw-r--r-- | drivers/net/wireless/wavelan_cs.p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/wavelan_cs.p.h b/drivers/net/wireless/wavelan_cs.p.h index 451f6271dcbc..c65fe7a391ec 100644 --- a/drivers/net/wireless/wavelan_cs.p.h +++ b/drivers/net/wireless/wavelan_cs.p.h @@ -602,7 +602,7 @@ struct net_local dev_node_t node; /* ???? What is this stuff ???? */ struct net_device * dev; /* Reverse link... */ spinlock_t spinlock; /* Serialize access to the hardware (SMP) */ - dev_link_t * link; /* pcmcia structure */ + struct pcmcia_device * link; /* pcmcia structure */ en_stats stats; /* Ethernet interface statistics */ int nresets; /* Number of hw resets */ u_char configured; /* If it is configured */ @@ -733,9 +733,9 @@ static int static inline void wv_hw_reset(struct net_device *); /* Same, + start receiver unit */ static inline int - wv_pcmcia_config(dev_link_t *); /* Configure the pcmcia interface */ + wv_pcmcia_config(struct pcmcia_device *); /* Configure the pcmcia interface */ static void - wv_pcmcia_release(dev_link_t *);/* Remove a device */ + wv_pcmcia_release(struct pcmcia_device *);/* Remove a device */ /* ---------------------- INTERRUPT HANDLING ---------------------- */ static irqreturn_t wavelan_interrupt(int, /* Interrupt handler */ |