summaryrefslogtreecommitdiffstats
path: root/drivers/net/hamradio/soundmodem/sm.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-09-28 22:25:29 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-09-28 22:25:29 +0000
commit0ae8dceaebe3659ee0c3352c08125f403e77ebca (patch)
tree5085c389f09da78182b899d19fe1068b619a69dd /drivers/net/hamradio/soundmodem/sm.c
parent273767781288c35c9d679e908672b9996cda4c34 (diff)
Merge with 2.3.10.
Diffstat (limited to 'drivers/net/hamradio/soundmodem/sm.c')
-rw-r--r--drivers/net/hamradio/soundmodem/sm.c8
1 files changed, 4 insertions, 4 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;