diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
| commit | 0ae8dceaebe3659ee0c3352c08125f403e77ebca (patch) | |
| tree | 5085c389f09da78182b899d19fe1068b619a69dd /drivers/net/hamradio/soundmodem | |
| parent | 273767781288c35c9d679e908672b9996cda4c34 (diff) | |
Merge with 2.3.10.
Diffstat (limited to 'drivers/net/hamradio/soundmodem')
| -rw-r--r-- | drivers/net/hamradio/soundmodem/sm.c | 8 | ||||
| -rw-r--r-- | drivers/net/hamradio/soundmodem/sm.h | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/hamradio/soundmodem/sm.c b/drivers/net/hamradio/soundmodem/sm.c index 15b5239fd..193ffeae2 100644 --- a/drivers/net/hamradio/soundmodem/sm.c +++ b/drivers/net/hamradio/soundmodem/sm.c @@ -640,9 +640,9 @@ static int sm_ioctl(struct device *dev, struct ifreq *ifr, /* --------------------------------------------------------------------- */ #ifdef MODULE -__initfunc(static int sm_init(void)) +static int __init sm_init(void) #else /* MODULE */ -__initfunc(int sm_init(void)) +int __init sm_init(void) #endif /* MODULE */ { int i, j, found = 0; @@ -724,7 +724,7 @@ MODULE_DESCRIPTION("Soundcard amateur radio modem driver"); #endif -__initfunc(int init_module(void)) +int __init init_module(void) { if (mode) { if (iobase == -1) @@ -778,7 +778,7 @@ void cleanup_module(void) * modem: afsk1200, fsk9600 */ -__initfunc(void sm_setup(char *str, int *ints)) +void __init sm_setup(char *str, int *ints) { int i; diff --git a/drivers/net/hamradio/soundmodem/sm.h b/drivers/net/hamradio/soundmodem/sm.h index 66e8f936c..68799e20e 100644 --- a/drivers/net/hamradio/soundmodem/sm.h +++ b/drivers/net/hamradio/soundmodem/sm.h @@ -296,8 +296,6 @@ extern inline unsigned int lcm(unsigned int x, unsigned int y) #ifdef __i386__ -#include <asm/processor.h> - #define HAS_RDTSC (current_cpu_data.x86_capability & X86_FEATURE_TSC) /* |