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 /drivers/net/hamradio/soundmodem/sm.h | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'drivers/net/hamradio/soundmodem/sm.h')
| -rw-r--r-- | drivers/net/hamradio/soundmodem/sm.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/net/hamradio/soundmodem/sm.h b/drivers/net/hamradio/soundmodem/sm.h index 68799e20e..4608b3650 100644 --- a/drivers/net/hamradio/soundmodem/sm.h +++ b/drivers/net/hamradio/soundmodem/sm.h @@ -3,7 +3,7 @@ /* * sm.h -- soundcard radio modem driver internal header. * - * Copyright (C) 1996-1998 Thomas Sailer (sailer@ife.ee.ethz.ch) + * Copyright (C) 1996-1999 Thomas Sailer (sailer@ife.ee.ethz.ch) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -34,6 +34,7 @@ #include <linux/soundmodem.h> #include <asm/processor.h> #include <linux/bitops.h> +#include <linux/parport.h> #define SM_DEBUG @@ -50,6 +51,8 @@ struct sm_state { const struct hardware_info *hwdrv; + struct pardevice *pardev; + /* * Hardware (soundcard) access routines state */ @@ -138,11 +141,11 @@ struct hardware_info { /* * mode specific open/close */ - int (*open)(struct device *, struct sm_state *); - int (*close)(struct device *, struct sm_state *); - int (*ioctl)(struct device *, struct sm_state *, struct ifreq *, + int (*open)(struct net_device *, struct sm_state *); + int (*close)(struct net_device *, struct sm_state *); + int (*ioctl)(struct net_device *, struct sm_state *, struct ifreq *, struct hdlcdrv_ioctl *, int); - int (*sethw)(struct device *, struct sm_state *, char *); + int (*sethw)(struct net_device *, struct sm_state *, char *); }; /* --------------------------------------------------------------------- */ |