summaryrefslogtreecommitdiffstats
path: root/drivers/usb/storage/usual-tables.c
diff options
context:
space:
mode:
authorhuajun li <huajun.li.lee@gmail.com>2011-03-04 10:56:18 +0800
committerGreg Kroah-Hartman <gregkh@suse.de>2011-03-07 13:40:59 -0800
commit41e568d14ec0aca1b2bb19563517aad3b06d6805 (patch)
treee1c9e5a384bb0ae1909ab373b13d127ef0f0b0de /drivers/usb/storage/usual-tables.c
parent153775d94899503f5f66baaa9751a43c74d4f371 (diff)
downloadtalos-op-linux-41e568d14ec0aca1b2bb19563517aad3b06d6805.tar.gz
talos-op-linux-41e568d14ec0aca1b2bb19563517aad3b06d6805.zip
Staging: Merge ENE UB6250 SD card codes from keucr to drivers/usb/storage
The usb portion of this driver can now go into drivers/usb/storage. This leaves the non-usb portion of the code still in staging. Signed-off-by: Huajun Li <huajun.li.lee@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/storage/usual-tables.c')
-rw-r--r--drivers/usb/storage/usual-tables.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/storage/usual-tables.c b/drivers/usb/storage/usual-tables.c
index 468bde7d1971..f0f60b6a2cfa 100644
--- a/drivers/usb/storage/usual-tables.c
+++ b/drivers/usb/storage/usual-tables.c
@@ -80,6 +80,7 @@ static struct ignore_entry ignore_ids[] = {
# include "unusual_alauda.h"
# include "unusual_cypress.h"
# include "unusual_datafab.h"
+# include "unusual_ene_ub6250.h"
# include "unusual_freecom.h"
# include "unusual_isd200.h"
# include "unusual_jumpshot.h"
OpenPOWER on IntegriCloud