diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-22 16:31:02 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-22 16:31:02 +1100 |
| commit | a30570ef9d04ae3ba9bae334dc180834655985ff (patch) | |
| tree | ed68ac5e0ef55d620863074166ca56a10a719c43 /drivers/staging/go7007/go7007-usb.c | |
| parent | 759bdb115a73efb800f732299d39314385a20b75 (diff) | |
| parent | 49408f8a88ff7660a7727ff7edbfb9b3a4d33ab3 (diff) | |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c
drivers/staging/sm7xx/smtc2d.c
drivers/staging/sm7xx/smtc2d.h
Diffstat (limited to 'drivers/staging/go7007/go7007-usb.c')
| -rw-r--r-- | drivers/staging/go7007/go7007-usb.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/staging/go7007/go7007-usb.c b/drivers/staging/go7007/go7007-usb.c index 1e89dc04ec23..ee278f64a16b 100644 --- a/drivers/staging/go7007/go7007-usb.c +++ b/drivers/staging/go7007/go7007-usb.c @@ -444,7 +444,9 @@ static struct go7007_usb_board board_sensoray_2250 = { }, }; -static struct usb_device_id go7007_usb_id_table[] = { +MODULE_FIRMWARE("go7007tv.bin"); + +static const struct usb_device_id go7007_usb_id_table[] = { { .match_flags = USB_DEVICE_ID_MATCH_DEVICE_AND_VERSION | USB_DEVICE_ID_MATCH_INT_INFO, |