Add missing MODULE_LICENSE tags to several net drivers.

Also... surprise!  Andrew Morton's aic7xxx build fix
is also included.  Ah well, 1001 people probably applied
the same patch by hand, and it's easy to merge, so oh well.

diff --git a/drivers/net/7990.c b/drivers/net/7990.c
index 7c99d9e3a4dd43e41a9d6d77e003bb98e4406355..05175da75e547129cbe748c5469317b8f9312256 100644 (file)
--- a/drivers/net/7990.c
+++ b/drivers/net/7990.c
@@ -630,3 +630,4 @@ void lance_set_multicast (struct net_device *dev)
                netif_start_queue (dev);
 }
 
+MODULE_LICENSE("GPL");

diff --git a/drivers/net/arcnet/arc-rawmode.c b/drivers/net/arcnet/arc-rawmode.c
index e2ae2dab9f1df4d58a7c26bd828741ce649d83ae..bc507ec59dbd51567eeeedbb88ad07acc84445f4 100644 (file)
--- a/drivers/net/arcnet/arc-rawmode.c
+++ b/drivers/net/arcnet/arc-rawmode.c
@@ -83,6 +83,7 @@ void cleanup_module(void)
        arcnet_unregister_proto(&rawmode_proto);
 }
 
+MODULE_LICENSE("GPL");
 #endif                         /* MODULE */
 
 

diff --git a/drivers/net/arcnet/arc-rimi.c b/drivers/net/arcnet/arc-rimi.c
index b2f16c36b2c24b81ce537a5b78ddba848b727154..f4de32bc00952d0d243b78148afc2c4d302141ec 100644 (file)
--- a/drivers/net/arcnet/arc-rimi.c
+++ b/drivers/net/arcnet/arc-rimi.c
@@ -295,6 +295,7 @@ MODULE_PARM(node, "i");
 MODULE_PARM(io, "i");
 MODULE_PARM(irq, "i");
 MODULE_PARM(device, "s");
+MODULE_LICENSE("GPL");
 
 int init_module(void)
 {

diff --git a/drivers/net/arcnet/arcnet.c b/drivers/net/arcnet/arcnet.c
index 826f26dd69fa6a3f26e4f1e1b3135a690786c4e4..9af4bcddfa9c4a5f0992a2424b6fef5ff4f324b2 100644 (file)
--- a/drivers/net/arcnet/arcnet.c
+++ b/drivers/net/arcnet/arcnet.c
@@ -163,6 +163,7 @@ void __init arcnet_init(void)
 
 static int debug = ARCNET_DEBUG;
 MODULE_PARM(debug, "i");
+MODULE_LICENSE("GPL");
 
 int __init init_module(void)
 {

diff --git a/drivers/net/arcnet/com20020-isa.c b/drivers/net/arcnet/com20020-isa.c
index 621ff78cede373320cd12471f35b1998f1461df5..b37420abd1b7e573bfd4c83eff6e56c87af0f72e 100644 (file)
--- a/drivers/net/arcnet/com20020-isa.c
+++ b/drivers/net/arcnet/com20020-isa.c
@@ -133,6 +133,7 @@ MODULE_PARM(timeout, "i");
 MODULE_PARM(backplane, "i");
 MODULE_PARM(clockp, "i");
 MODULE_PARM(clockm, "i");
+MODULE_LICENSE("GPL");
 
 static void com20020isa_open_close(struct net_device *dev, bool open)
 {

diff --git a/drivers/net/arcnet/com20020-pci.c b/drivers/net/arcnet/com20020-pci.c
index 9a297615862df17f61b33fed916d135fe7c79f66..b26547d4f142dbb04a123135e2aee377bc336a62 100644 (file)
--- a/drivers/net/arcnet/com20020-pci.c
+++ b/drivers/net/arcnet/com20020-pci.c
@@ -57,6 +57,7 @@ MODULE_PARM(timeout, "i");
 MODULE_PARM(backplane, "i");
 MODULE_PARM(clockp, "i");
 MODULE_PARM(clockm, "i");
+MODULE_LICENSE("GPL");
 
 static void com20020pci_open_close(struct net_device *dev, bool open)
 {

diff --git a/drivers/net/arcnet/com20020.c b/drivers/net/arcnet/com20020.c
index 851e43be975f9b85eff8dbc66c16b6991c3f80d8..d7ac16c4ad3c28b164d61d1256e8333541f155b0 100644 (file)
--- a/drivers/net/arcnet/com20020.c
+++ b/drivers/net/arcnet/com20020.c
@@ -356,6 +356,8 @@ EXPORT_SYMBOL(com20020_check);
 EXPORT_SYMBOL(com20020_found);
 EXPORT_SYMBOL(com20020_remove);
 
+MODULE_LICENSE("GPL");
+
 int init_module(void)
 {
        BUGLVL(D_NORMAL) printk(VERSION);

diff --git a/drivers/net/arcnet/com90io.c b/drivers/net/arcnet/com90io.c
index 11a28fa4ed5ef92531d2c8a20986fa4866d461f8..07d546684e2803d914488ae0981a9cb2368bcb60 100644 (file)
--- a/drivers/net/arcnet/com90io.c
+++ b/drivers/net/arcnet/com90io.c
@@ -383,6 +383,7 @@ static char *device;                /* use eg. device=arc1 to change name */
 MODULE_PARM(io, "i");
 MODULE_PARM(irq, "i");
 MODULE_PARM(device, "s");
+MODULE_LICENSE("GPL");
 
 int init_module(void)
 {

diff --git a/drivers/net/arcnet/com90xx.c b/drivers/net/arcnet/com90xx.c
index 9d208f400df71a646e82b66312fef65ecde7e432..6ce29add0187c85e502ddbc74accdebb0b0235b4 100644 (file)
--- a/drivers/net/arcnet/com90xx.c
+++ b/drivers/net/arcnet/com90xx.c
@@ -617,6 +617,7 @@ MODULE_PARM(io, "i");
 MODULE_PARM(irq, "i");
 MODULE_PARM(shmem, "i");
 MODULE_PARM(device, "s");
+MODULE_LICENSE("GPL");
 
 int init_module(void)
 {

diff --git a/drivers/net/arcnet/rfc1051.c b/drivers/net/arcnet/rfc1051.c
index f67e81d636860bbb8012faad99e12dc67818a058..f3d59d1ae32c8869ec151546d707731625b1a9ae 100644 (file)
--- a/drivers/net/arcnet/rfc1051.c
+++ b/drivers/net/arcnet/rfc1051.c
@@ -68,6 +68,8 @@ void __init arcnet_rfc1051_init(void)
 
 #ifdef MODULE
 
+MODULE_LICENSE("GPL");
+
 int __init init_module(void)
 {
        printk(VERSION);

diff --git a/drivers/net/arcnet/rfc1201.c b/drivers/net/arcnet/rfc1201.c
index a4e1780b9403833e0f843b7c05f914014d2b8f7c..51415fc96d5a09b977634f7699130237bd99f171 100644 (file)
--- a/drivers/net/arcnet/rfc1201.c
+++ b/drivers/net/arcnet/rfc1201.c
@@ -70,6 +70,8 @@ void __init arcnet_rfc1201_init(void)
 
 #ifdef MODULE
 
+MODULE_LICENSE("GPL");
+
 int __init init_module(void)
 {
        printk(VERSION);

diff --git a/drivers/net/ariadne.c b/drivers/net/ariadne.c
index bc6f4c999e4b57a6e2a16cfdfe88ec975dcc9f9a..55b8ee981fc72d91e2110b5db0e826fcfcb47a37 100644 (file)
--- a/drivers/net/ariadne.c
+++ b/drivers/net/ariadne.c
@@ -847,3 +847,5 @@ static void __exit ariadne_cleanup(void)
 
 module_init(ariadne_probe);
 module_exit(ariadne_cleanup);
+
+MODULE_LICENSE("GPL");

diff --git a/drivers/net/ariadne2.c b/drivers/net/ariadne2.c
index 843b3e8fc7cf408f53a4361774a9e2e66f867925..e539b7dbcc0e3382e41d5cd579e7b2d6ef4054ca 100644 (file)
--- a/drivers/net/ariadne2.c
+++ b/drivers/net/ariadne2.c
@@ -423,3 +423,5 @@ static void __exit ariadne2_cleanup(void)
 
 module_init(ariadne2_probe);
 module_exit(ariadne2_cleanup);
+
+MODULE_LICENSE("GPL");

diff --git a/drivers/net/daynaport.c b/drivers/net/daynaport.c
index ea424dcb74370131081d0aff5c5dedd82586e7ca..01975e7c5a74d1d4b2bc9bcab7274135b651c3d5 100644 (file)
--- a/drivers/net/daynaport.c
+++ b/drivers/net/daynaport.c
@@ -919,12 +919,4 @@ static void slow_sane_block_output(struct net_device *dev, int count, const unsi
 #endif 
 }
 
-/*
- * Local variables:
- *  compile-command: "gcc -D__KERNEL__ -I/usr/src/linux/net/inet -Wall -Wstrict-prototypes -O6 -m486 -c daynaport.c"
- *  version-control: t
- *  c-basic-offset: 4
- *  tab-width: 4
- *  kept-new-versions: 5
- * End:
- */
+MODULE_LICENSE("GPL");

diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
index 26f08dce4b20a4ab9cf20a2137ca31e60105ae17..05517ef853e431d7d2e4b2db77aef3f23ec29ec8 100644 (file)
--- a/drivers/net/hamradio/6pack.c
+++ b/drivers/net/hamradio/6pack.c
@@ -1063,6 +1063,7 @@ static void decode_data(unsigned char inbyte, struct sixpack *sp)
 
 MODULE_AUTHOR("Andreas Könsgen <ajk@ccac.rwth-aachen.de>");
 MODULE_DESCRIPTION("6pack driver for AX.25");
+MODULE_LICENSE("GPL");
 
 module_init(sixpack_init_driver);
 module_exit(sixpack_exit_driver);

diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c
index 30598d8418214f3f9c9aafdd8dcf35ac5ab25b1a..cc925c52622f0018981b0a197c9fd4f397944f15 100644 (file)
--- a/drivers/net/hamradio/baycom_epp.c
+++ b/drivers/net/hamradio/baycom_epp.c
@@ -1416,6 +1416,7 @@ MODULE_PARM_DESC(iobase, "baycom io base address");
 
 MODULE_AUTHOR("Thomas M. Sailer, sailer@ife.ee.ethz.ch, hb9jnx@hb9w.che.eu");
 MODULE_DESCRIPTION("Baycom epp amateur radio modem driver");
+MODULE_LICENSE("GPL");
 
 /* --------------------------------------------------------------------- */
 

diff --git a/drivers/net/hamradio/baycom_par.c b/drivers/net/hamradio/baycom_par.c
index 508b6dc37463780c10063203d98f14591ec802ff..03fd3f71682c02aa7fa5ce192803d50d08d53c83 100644 (file)
--- a/drivers/net/hamradio/baycom_par.c
+++ b/drivers/net/hamradio/baycom_par.c
@@ -493,6 +493,7 @@ MODULE_PARM_DESC(iobase, "baycom io base address");
 
 MODULE_AUTHOR("Thomas M. Sailer, sailer@ife.ee.ethz.ch, hb9jnx@hb9w.che.eu");
 MODULE_DESCRIPTION("Baycom par96 and picpar amateur radio modem driver");
+MODULE_LICENSE("GPL");
 
 /* --------------------------------------------------------------------- */
 

diff --git a/drivers/net/hamradio/baycom_ser_fdx.c b/drivers/net/hamradio/baycom_ser_fdx.c
index 7fd2a1dc4e59a0c3ebbdf3985e0b0e841cca8f4f..70050a14d7abdd08d917d81d581ae3e35bb57f9d 100644 (file)
--- a/drivers/net/hamradio/baycom_ser_fdx.c
+++ b/drivers/net/hamradio/baycom_ser_fdx.c
@@ -609,6 +609,7 @@ MODULE_PARM_DESC(baud, "baycom baud rate (300 to 4800)");
 
 MODULE_AUTHOR("Thomas M. Sailer, sailer@ife.ee.ethz.ch, hb9jnx@hb9w.che.eu");
 MODULE_DESCRIPTION("Baycom ser12 full duplex amateur radio modem driver");
+MODULE_LICENSE("GPL");
 
 /* --------------------------------------------------------------------- */
 

diff --git a/drivers/net/hamradio/baycom_ser_hdx.c b/drivers/net/hamradio/baycom_ser_hdx.c
index d2b82e589a5adf9044ac2317d9e5d89caf4de2ef..479ea0968e4f087106b96d4d57546fe80eb8ce1e 100644 (file)
--- a/drivers/net/hamradio/baycom_ser_hdx.c
+++ b/drivers/net/hamradio/baycom_ser_hdx.c
@@ -649,6 +649,7 @@ MODULE_PARM_DESC(irq, "baycom irq number");
 
 MODULE_AUTHOR("Thomas M. Sailer, sailer@ife.ee.ethz.ch, hb9jnx@hb9w.che.eu");
 MODULE_DESCRIPTION("Baycom ser12 half duplex amateur radio modem driver");
+MODULE_LICENSE("GPL");
 
 /* --------------------------------------------------------------------- */
 

diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c
index b42de807a617bf65cc8117c43150d0c41709f1dd..2d8b541a70f216af84e37db4df2c6c4be2351217 100644 (file)
--- a/drivers/net/hamradio/bpqether.c
+++ b/drivers/net/hamradio/bpqether.c
@@ -645,5 +645,6 @@ static void __exit bpq_cleanup_driver(void)
 
 MODULE_AUTHOR("Joerg Reuter DL1BKE <jreuter@yaina.de>");
 MODULE_DESCRIPTION("Transmit and receive AX.25 packets over Ethernet");
+MODULE_LICENSE("GPL");
 module_init(bpq_init_driver);
 module_exit(bpq_cleanup_driver);

diff --git a/drivers/net/hamradio/dmascc.c b/drivers/net/hamradio/dmascc.c
index 9f237af5479b4b757f772eca2f5c276a9df0f779..fbdd9aee23eeee568cf1b0018afe00e850d3a696 100644 (file)
--- a/drivers/net/hamradio/dmascc.c
+++ b/drivers/net/hamradio/dmascc.c
@@ -305,6 +305,7 @@ static unsigned long rand;
 MODULE_AUTHOR("Klaus Kudielka");
 MODULE_DESCRIPTION("Driver for high-speed SCC boards");
 MODULE_PARM(io, "1-" __MODULE_STRING(MAX_NUM_DEVS) "i");
+MODULE_LICENSE("GPL");
 
 
 int init_module(void) {

diff --git a/drivers/net/hamradio/hdlcdrv.c b/drivers/net/hamradio/hdlcdrv.c
index d6ee7d23a8f3948d3a8e6b39c6679396a2afdc49..980dbbe807f52e63206a17f5bb8f282616ca068c 100644 (file)
--- a/drivers/net/hamradio/hdlcdrv.c
+++ b/drivers/net/hamradio/hdlcdrv.c
@@ -902,6 +902,7 @@ static void __exit hdlcdrv_cleanup_driver(void)
 
 MODULE_AUTHOR("Thomas M. Sailer, sailer@ife.ee.ethz.ch, hb9jnx@hb9w.che.eu");
 MODULE_DESCRIPTION("Packet Radio network interface HDLC encoder/decoder");
+MODULE_LICENSE("GPL");
 module_init(hdlcdrv_init_driver);
 module_exit(hdlcdrv_cleanup_driver);
 

diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c
index 4f32863e7da8b3b48834592103c2d70b8b70ab5c..68ef2d9bf9878645a44aca3d4dadd2e6d0f90260 100644 (file)
--- a/drivers/net/hamradio/mkiss.c
+++ b/drivers/net/hamradio/mkiss.c
@@ -1008,6 +1008,7 @@ MODULE_AUTHOR("Hans Albas PE1AYX <hans@esrac.ele.tue.nl>");
 MODULE_DESCRIPTION("KISS driver for AX.25 over TTYs");
 MODULE_PARM(ax25_maxdev, "i");
 MODULE_PARM_DESC(ax25_maxdev, "number of MKISS devices");
+MODULE_LICENSE("GPL");
 
 module_init(mkiss_init_driver);
 module_exit(mkiss_exit_driver);

diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c
index fe404f3660221b35319692bc88d06fe6799e9387..ef075310b6e8d0a0034f75c9f6cb8b5b51d75bd7 100644 (file)
--- a/drivers/net/hamradio/scc.c
+++ b/drivers/net/hamradio/scc.c
@@ -2180,5 +2180,6 @@ static void __exit scc_cleanup_driver(void)
 MODULE_AUTHOR("Joerg Reuter <jreuter@yaina.de>");
 MODULE_DESCRIPTION("AX.25 Device Driver for Z8530 based HDLC cards");
 MODULE_SUPPORTED_DEVICE("Z8530 based SCC cards for Amateur Radio");
+MODULE_LICENSE("GPL");
 module_init(scc_init_driver);
 module_exit(scc_cleanup_driver);

diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c
index d74a43f3ce20f647d822316fcc98ffa763847b3b..d9d82f0dab4882ef095939682628e037a3b5a8e9 100644 (file)
--- a/drivers/net/hamradio/yam.c
+++ b/drivers/net/hamradio/yam.c
@@ -1179,6 +1179,7 @@ static void __exit yam_cleanup_driver(void)
 
 MODULE_AUTHOR("Frederic Rible F1OAT frible@teaser.fr");
 MODULE_DESCRIPTION("Yam amateur radio modem driver");
+MODULE_LICENSE("GPL");
 
 module_init(yam_init_driver);
 module_exit(yam_cleanup_driver);

diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c
index e39f19002c123194560540cd18f1052e9f4f0208..f9d4fe17ebe862a73013d96b59964d173a88f472 100644 (file)
--- a/drivers/net/irda/irda-usb.c
+++ b/drivers/net/irda/irda-usb.c
@@ -1626,3 +1626,4 @@ MODULE_PARM(qos_mtt_bits, "i");
 MODULE_PARM_DESC(qos_mtt_bits, "Minimum Turn Time");
 MODULE_AUTHOR("Roman Weissgaerber <weissg@vienna.at>, Dag Brattli <dag@brattli.net> and Jean Tourrilhes <jt@hpl.hp.com>");
 MODULE_DESCRIPTION("IrDA-USB Dongle Driver"); 
+MODULE_LICENSE("GPL");

diff --git a/drivers/net/rrunner.c b/drivers/net/rrunner.c
index 4192b5e7aa256193f3e288d7afa9461c9ddd9888..a42abd30adddc36b8fab37668b88b238b013585d 100644 (file)
--- a/drivers/net/rrunner.c
+++ b/drivers/net/rrunner.c
@@ -271,6 +271,7 @@ int __init rr_hippi_probe (struct net_device *dev)
 #if LINUX_VERSION_CODE > 0x20118
 MODULE_AUTHOR("Jes Sorensen <Jes.Sorensen@cern.ch>");
 MODULE_DESCRIPTION("Essential RoadRunner HIPPI driver");
+MODULE_LICENSE("GPL");
 #endif
 
 int init_module(void)

diff --git a/drivers/net/sgiseeq.c b/drivers/net/sgiseeq.c
index 39e7d6b6ae219c8c9dc98be01cc5651d9c3014a8..a82f78a5877728c51177c32ddfd887fd2c1a0492 100644 (file)
--- a/drivers/net/sgiseeq.c
+++ b/drivers/net/sgiseeq.c
@@ -720,3 +720,5 @@ int sgiseeq_probe(struct net_device *dev)
                            (struct sgiseeq_regs *) (KSEG1ADDR(0x1fbd4000)),
                            &hpc3c0->ethregs, SGI_ENET_IRQ);
 }
+
+MODULE_LICENSE("GPL");

diff --git a/drivers/net/sonic.c b/drivers/net/sonic.c
index 0f39f8e9fc07e01bcef9d70472b75bbd9fd44be5..8a75fb20477b8eabcab8828e9b25ab47c0151296 100644 (file)
--- a/drivers/net/sonic.c
+++ b/drivers/net/sonic.c
@@ -620,3 +620,5 @@ static int sonic_init(struct net_device *dev)
 
        return 0;
 }
+
+MODULE_LICENSE("GPL");

diff --git a/drivers/scsi/aic7xxx/aic7xxx_linux.c b/drivers/scsi/aic7xxx/aic7xxx_linux.c
index 2edba37b5aa15a176611eb4a7843eaa2b3dcbd58..a5ed9dac061a8239f90bfa4e333b5e670801c024 100644 (file)
--- a/drivers/scsi/aic7xxx/aic7xxx_linux.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_linux.c
@@ -445,7 +445,7 @@ static void                 ahc_linux_free_device(struct ahc_softc*,
                                                      struct ahc_linux_device*);
 static void ahc_linux_run_device_queue(struct ahc_softc*,
                                       struct ahc_linux_device*);
-static void ahc_linux_setup_tag_info(char *p, char *end);
+static void ahc_linux_setup_tag_info(char *p, char *end, char *s);
 static int ahc_linux_next_unit(void);
 static int ahc_linux_halt(struct notifier_block *nb, u_long event, void *buf);