diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /include/linux/hdlcdrv.h | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'include/linux/hdlcdrv.h')
| -rw-r--r-- | include/linux/hdlcdrv.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/include/linux/hdlcdrv.h b/include/linux/hdlcdrv.h index 11cd8c6a0..2c7e5db58 100644 --- a/include/linux/hdlcdrv.h +++ b/include/linux/hdlcdrv.h @@ -106,7 +106,7 @@ struct hdlcdrv_ioctl { #include <linux/netdevice.h> #include <linux/if.h> -#include <asm/spinlock.h> +#include <linux/spinlock.h> #define HDLCDRV_MAGIC 0x5ac6e778 #define HDLCDRV_IFNAMELEN 6 @@ -173,9 +173,9 @@ struct hdlcdrv_ops { /* * the routines called by the hdlcdrv routines */ - int (*open)(struct device *); - int (*close)(struct device *); - int (*ioctl)(struct device *, struct ifreq *, + int (*open)(struct net_device *); + int (*close)(struct net_device *); + int (*ioctl)(struct net_device *, struct ifreq *, struct hdlcdrv_ioctl *, int); }; @@ -361,14 +361,14 @@ extern inline int hdlcdrv_ptt(struct hdlcdrv_state *s) /* -------------------------------------------------------------------- */ -void hdlcdrv_receiver(struct device *, struct hdlcdrv_state *); -void hdlcdrv_transmitter(struct device *, struct hdlcdrv_state *); -void hdlcdrv_arbitrate(struct device *, struct hdlcdrv_state *); -int hdlcdrv_register_hdlcdrv(struct device *dev, const struct hdlcdrv_ops *ops, +void hdlcdrv_receiver(struct net_device *, struct hdlcdrv_state *); +void hdlcdrv_transmitter(struct net_device *, struct hdlcdrv_state *); +void hdlcdrv_arbitrate(struct net_device *, struct hdlcdrv_state *); +int hdlcdrv_register_hdlcdrv(struct net_device *dev, const struct hdlcdrv_ops *ops, unsigned int privsize, char *ifname, unsigned int baseaddr, unsigned int irq, unsigned int dma); -int hdlcdrv_unregister_hdlcdrv(struct device *dev); +int hdlcdrv_unregister_hdlcdrv(struct net_device *dev); /* -------------------------------------------------------------------- */ |