diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/usb/storage/usual-tables.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/usb/storage/usual-tables.c')
| -rw-r--r-- | drivers/usb/storage/usual-tables.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/storage/usual-tables.c b/drivers/usb/storage/usual-tables.c index 468bde7d1971..b96927914f89 100644 --- a/drivers/usb/storage/usual-tables.c +++ b/drivers/usb/storage/usual-tables.c | |||
| @@ -80,11 +80,13 @@ static struct ignore_entry ignore_ids[] = { | |||
| 80 | # include "unusual_alauda.h" | 80 | # include "unusual_alauda.h" |
| 81 | # include "unusual_cypress.h" | 81 | # include "unusual_cypress.h" |
| 82 | # include "unusual_datafab.h" | 82 | # include "unusual_datafab.h" |
| 83 | # include "unusual_ene_ub6250.h" | ||
| 83 | # include "unusual_freecom.h" | 84 | # include "unusual_freecom.h" |
| 84 | # include "unusual_isd200.h" | 85 | # include "unusual_isd200.h" |
| 85 | # include "unusual_jumpshot.h" | 86 | # include "unusual_jumpshot.h" |
| 86 | # include "unusual_karma.h" | 87 | # include "unusual_karma.h" |
| 87 | # include "unusual_onetouch.h" | 88 | # include "unusual_onetouch.h" |
| 89 | # include "unusual_realtek.h" | ||
| 88 | # include "unusual_sddr09.h" | 90 | # include "unusual_sddr09.h" |
| 89 | # include "unusual_sddr55.h" | 91 | # include "unusual_sddr55.h" |
| 90 | # include "unusual_usbat.h" | 92 | # include "unusual_usbat.h" |