diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2015-06-24 04:23:46 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2015-06-24 10:03:18 +0200 |
| commit | e5067d7cd967cb17067de24a162306b79f432b20 (patch) | |
| tree | 541f101762df32a5742bec354009986a96d8e564 /drivers/net/hamradio/hdlcdrv.c | |
| parent | 86a981e836404006efc35881ebf3d5ae36925e82 (diff) | |
Import newax25-2.4.3.patch.1.bz2HEADnewax25-2.4.3-1
And cleanup the *.orig and *.rej files and whitespace errors that are part
of the original patch.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'drivers/net/hamradio/hdlcdrv.c')
| -rw-r--r-- | drivers/net/hamradio/hdlcdrv.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/drivers/net/hamradio/hdlcdrv.c b/drivers/net/hamradio/hdlcdrv.c index e1af65373..1726c8ed3 100644 --- a/drivers/net/hamradio/hdlcdrv.c +++ b/drivers/net/hamradio/hdlcdrv.c @@ -287,7 +287,7 @@ void hdlcdrv_receiver(struct net_device *dev, struct hdlcdrv_state *s) /* ---------------------------------------------------------------------- */ -static inline void do_kiss_params(struct hdlcdrv_state *s, +static void inline do_kiss_params(struct hdlcdrv_state *s, unsigned char *data, unsigned long len) { @@ -889,7 +889,14 @@ EXPORT_SYMBOL(hdlcdrv_unregister_hdlcdrv); /* --------------------------------------------------------------------- */ -static int __init hdlcdrv_init_driver(void) +#ifdef MODULE + +MODULE_AUTHOR("Thomas M. Sailer, sailer@ife.ee.ethz.ch, hb9jnx@hb9w.che.eu"); +MODULE_DESCRIPTION("Packet Radio network interface HDLC encoder/decoder"); + +/* --------------------------------------------------------------------- */ + +int __init init_module(void) { printk(KERN_INFO "hdlcdrv: (C) 1996-2000 Thomas Sailer HB9JNX/AE4WA\n"); printk(KERN_INFO "hdlcdrv: version 0.8 compiled " __TIME__ " " __DATE__ "\n"); @@ -898,16 +905,10 @@ static int __init hdlcdrv_init_driver(void) /* --------------------------------------------------------------------- */ -static void __exit hdlcdrv_cleanup_driver(void) +void cleanup_module(void) { printk(KERN_INFO "hdlcdrv: cleanup\n"); } -/* --------------------------------------------------------------------- */ - -MODULE_AUTHOR("Thomas M. Sailer, sailer@ife.ee.ethz.ch, hb9jnx@hb9w.che.eu"); -MODULE_DESCRIPTION("Packet Radio network interface HDLC encoder/decoder"); -module_init(hdlcdrv_init_driver); -module_exit(hdlcdrv_cleanup_driver); - +#endif /* MODULE */ /* --------------------------------------------------------------------- */ |