This patch was created by Maciej Grela.
The lack of a MODULE_LICENSE macro in ums-* subdrivers prevented them
from loading. Needs to be applied after Alan Stern's usb-storage
subdriver separation patchset. Also added missing MODULE_DESCRIPTION and
MODULE_AUTHOR entries.
Greg, please apply.
Matt
Signed-off-by: Maciej Grela <maciej.grela@xxxxxxxxx>
Acked-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
Acked-by: Matthew Dharm <mdharm-usb@xxxxxxxxxxxxxxxxxx>
---
drivers/usb/storage/alauda.c | 4 ++++
drivers/usb/storage/cypress_atacb.c | 3 +++
drivers/usb/storage/datafab.c | 4 ++++
drivers/usb/storage/freecom.c | 4 ++++
drivers/usb/storage/isd200.c | 3 +++
drivers/usb/storage/jumpshot.c | 4 ++++
drivers/usb/storage/karma.c | 4 ++++
drivers/usb/storage/onetouch.c | 4 ++++
drivers/usb/storage/sddr09.c | 3 +++
drivers/usb/storage/sddr55.c | 3 +++
drivers/usb/storage/shuttle_usbat.c | 3 +++
11 files changed, 39 insertions(+), 0 deletions(-)
diff --git a/drivers/usb/storage/alauda.c b/drivers/usb/storage/alauda.c
index 8eb2fa1..90e61f5 100644
--- a/drivers/usb/storage/alauda.c
+++ b/drivers/usb/storage/alauda.c
@@ -42,6 +42,10 @@
#include "protocol.h"
#include "debug.h"
+MODULE_DESCRIPTION("Driver for Alauda-based card readers");
+MODULE_AUTHOR("Daniel Drake <dsd@xxxxxxxxxx>");
+MODULE_LICENSE("GPL");
+
/*
* Status bytes
*/
diff --git a/drivers/usb/storage/cypress_atacb.c
b/drivers/usb/storage/cypress_atacb.c
index 44090c2..6511478 100644
--- a/drivers/usb/storage/cypress_atacb.c
+++ b/drivers/usb/storage/cypress_atacb.c
@@ -30,6 +30,9 @@
#include "scsiglue.h"
#include "debug.h"
+MODULE_DESCRIPTION("SAT support for Cypress USB/ATA bridges with ATACB");
+MODULE_AUTHOR("Matthieu Castet <castet.matthieu@xxxxxxx>");
+MODULE_LICENSE("GPL");
/*
* The table of devices
diff --git a/drivers/usb/storage/datafab.c b/drivers/usb/storage/datafab.c
index 2d8d835..2b6e565 100644
--- a/drivers/usb/storage/datafab.c
+++ b/drivers/usb/storage/datafab.c
@@ -60,6 +60,10 @@
#include "protocol.h"
#include "debug.h"
+MODULE_DESCRIPTION("Driver for Datafab USB Compact Flash reader");
+MODULE_AUTHOR("Jimmie Mayfield <mayfield+datafab@xxxxxxxxxxxxx>");
+MODULE_LICENSE("GPL");
+
struct datafab_info {
unsigned long sectors; /* total sector count */
unsigned long ssize; /* sector size in bytes */
diff --git a/drivers/usb/storage/freecom.c b/drivers/usb/storage/freecom.c
index 393047b..54cc942 100644
--- a/drivers/usb/storage/freecom.c
+++ b/drivers/usb/storage/freecom.c
@@ -35,6 +35,10 @@
#include "protocol.h"
#include "debug.h"
+MODULE_DESCRIPTION("Driver for Freecom USB/IDE adaptor");
+MODULE_AUTHOR("David Brown <usb-storage@xxxxxxxxxx>");
+MODULE_LICENSE("GPL");
+
#ifdef CONFIG_USB_STORAGE_DEBUG
static void pdump (void *, int);
#endif
diff --git a/drivers/usb/storage/isd200.c b/drivers/usb/storage/isd200.c
index df94300..233337c 100644
--- a/drivers/usb/storage/isd200.c
+++ b/drivers/usb/storage/isd200.c
@@ -59,6 +59,9 @@
#include "debug.h"
#include "scsiglue.h"
+MODULE_DESCRIPTION("Driver for In-System Design, Inc. ISD200 ASIC");
+MODULE_AUTHOR("Björn Stenberg <bjorn@xxxxxxx>");
+MODULE_LICENSE("GPL");
static int isd200_Initialization(struct us_data *us);
diff --git a/drivers/usb/storage/jumpshot.c b/drivers/usb/storage/jumpshot.c
index a50d6dc..1c69420 100644
--- a/drivers/usb/storage/jumpshot.c
+++ b/drivers/usb/storage/jumpshot.c
@@ -58,6 +58,10 @@
#include "debug.h"
+MODULE_DESCRIPTION("Driver for Lexar \"Jumpshot\" Compact Flash reader");
+MODULE_AUTHOR("Jimmie Mayfield <mayfield+usb@xxxxxxxxxxxxx>");
+MODULE_LICENSE("GPL");
+
/*
* The table of devices
*/
diff --git a/drivers/usb/storage/karma.c b/drivers/usb/storage/karma.c
index cfb8e60..7953d93 100644
--- a/drivers/usb/storage/karma.c
+++ b/drivers/usb/storage/karma.c
@@ -28,6 +28,10 @@
#include "transport.h"
#include "debug.h"
+MODULE_DESCRIPTION("Driver for Rio Karma");
+MODULE_AUTHOR("Bob Copeland <me@xxxxxxxxxxxxxxx>, Keith Bennett
<keith@xxxxxxxxxxxxxxxx>");
+MODULE_LICENSE("GPL");
+
#define RIO_PREFIX "RIOP\x00"
#define RIO_PREFIX_LEN 5
#define RIO_SEND_LEN 40
diff --git a/drivers/usb/storage/onetouch.c b/drivers/usb/storage/onetouch.c
index 8bd0956..380233b 100644
--- a/drivers/usb/storage/onetouch.c
+++ b/drivers/usb/storage/onetouch.c
@@ -37,6 +37,10 @@
#include "usb.h"
#include "debug.h"
+MODULE_DESCRIPTION("Maxtor USB OneTouch hard drive button driver");
+MODULE_AUTHOR("Nick Sillik <n.sillik@xxxxxxxxxx>");
+MODULE_LICENSE("GPL");
+
#define ONETOUCH_PKT_LEN 0x02
#define ONETOUCH_BUTTON KEY_PROG1
diff --git a/drivers/usb/storage/sddr09.c b/drivers/usb/storage/sddr09.c
index 5460261..c05eab8 100644
--- a/drivers/usb/storage/sddr09.c
+++ b/drivers/usb/storage/sddr09.c
@@ -53,6 +53,9 @@
#include "protocol.h"
#include "debug.h"
+MODULE_DESCRIPTION("Driver for SanDisk SDDR-09 SmartMedia reader");
+MODULE_AUTHOR("Andries Brouwer <aeb@xxxxxx>, Robert Baruch
<autophile@xxxxxxxxxxxx>");
+MODULE_LICENSE("GPL");
static int usb_stor_sddr09_dpcm_init(struct us_data *us);
static int sddr09_transport(struct scsi_cmnd *srb, struct us_data *us);
diff --git a/drivers/usb/storage/sddr55.c b/drivers/usb/storage/sddr55.c
index 22df4e1..c00270d 100644
--- a/drivers/usb/storage/sddr55.c
+++ b/drivers/usb/storage/sddr55.c
@@ -35,6 +35,9 @@
#include "protocol.h"
#include "debug.h"
+MODULE_DESCRIPTION("Driver for SanDisk SDDR-55 SmartMedia reader");
+MODULE_AUTHOR("Simon Munton");
+MODULE_LICENSE("GPL");
/*
* The table of devices
diff --git a/drivers/usb/storage/shuttle_usbat.c
b/drivers/usb/storage/shuttle_usbat.c
index d4fe0bb..b62a288 100644
--- a/drivers/usb/storage/shuttle_usbat.c
+++ b/drivers/usb/storage/shuttle_usbat.c
@@ -54,6 +54,9 @@
#include "protocol.h"
#include "debug.h"
+MODULE_DESCRIPTION("Driver for SCM Microsystems (a.k.a. Shuttle)
USB-ATAPI cable");
+MODULE_AUTHOR("Daniel Drake <dsd@xxxxxxxxxx>, Robert Baruch
<autophile@xxxxxxxxxxxx>");
+MODULE_LICENSE("GPL");
/* Supported device types */
#define USBAT_DEV_HP8200 0x01
--
Matthew Dharm Home: mdharm-usb@xxxxxxxxxxxxxxxxxx
Maintainer, Linux USB Mass Storage Driver
C: Why are you upgrading to NT?
AJ: It must be the sick, sadistic streak that runs through me.
-- Chief and A.J.
User Friendly, 5/12/1998
Attachment:
pgpuqz32g18fP.pgp
Description: PGP signature
