diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-06 02:08:07 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-06 02:08:07 -0400 |
| commit | ea2aca084ba82aaf7c148d04914ceed8758ce08a (patch) | |
| tree | dcb3f4f849cf48deac2dd3bafd5c2cd2f0e7dc79 /drivers/net/wireless/libertas | |
| parent | f3032be921cd126615ce3bfd7084e3d319f3f892 (diff) | |
| parent | c5a78ac00c400df29645e59938700301efb371d0 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wan/hdlc_fr.c
drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
Diffstat (limited to 'drivers/net/wireless/libertas')
| -rw-r--r-- | drivers/net/wireless/libertas/if_usb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c index 24783103a7dd..a8b4abce5bfa 100644 --- a/drivers/net/wireless/libertas/if_usb.c +++ b/drivers/net/wireless/libertas/if_usb.c | |||
| @@ -947,6 +947,7 @@ static struct usb_driver if_usb_driver = { | |||
| 947 | .id_table = if_usb_table, | 947 | .id_table = if_usb_table, |
| 948 | .suspend = if_usb_suspend, | 948 | .suspend = if_usb_suspend, |
| 949 | .resume = if_usb_resume, | 949 | .resume = if_usb_resume, |
| 950 | .reset_resume = if_usb_resume, | ||
| 950 | }; | 951 | }; |
| 951 | 952 | ||
| 952 | static int __init if_usb_init_module(void) | 953 | static int __init if_usb_init_module(void) |