diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-26 18:26:03 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-26 18:26:03 +1100 |
| commit | 7dacf842dba1515f097f9efe889e497adfc258ce (patch) | |
| tree | b25b366e96e42f3049b162a266abe19a253c2da5 /drivers/staging/go7007/s2250-loader.c | |
| parent | 190e8cfcb9ac7ae9bbf6b7f54450292f365727dc (diff) | |
| parent | 78a22eafad6d9c3ce5400b3226a407ea784d7ed0 (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/s2250-loader.c')
| -rw-r--r-- | drivers/staging/go7007/s2250-loader.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/go7007/s2250-loader.c b/drivers/staging/go7007/s2250-loader.c index c152ab9be2fb..1de2dfb16d3f 100644 --- a/drivers/staging/go7007/s2250-loader.c +++ b/drivers/staging/go7007/s2250-loader.c @@ -139,7 +139,7 @@ failed2: static void s2250loader_disconnect(struct usb_interface *interface) { - pdevice_extension_t s = usb_get_intfdata(interface); + pdevice_extension_t s; printk(KERN_INFO "s2250: disconnect\n"); lock_kernel(); s = usb_get_intfdata(interface); @@ -148,7 +148,7 @@ static void s2250loader_disconnect(struct usb_interface *interface) unlock_kernel(); } -static struct usb_device_id s2250loader_ids[] = { +static const struct usb_device_id s2250loader_ids[] = { {USB_DEVICE(0x1943, 0xa250)}, {} /* Terminating entry */ }; |