diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-14 00:29:49 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-14 00:29:49 -0400 |
| commit | 11c2d8174ed3dc4f1971564732689b4a39129702 (patch) | |
| tree | ac00daa548ea8ac24ae7a5c8062312e335ab9858 /drivers/net/wireless/libertas/if_usb.c | |
| parent | cde274c0c789404df8ece3f9e7d6506caf0127e2 (diff) | |
| parent | bce7f793daec3e65ec5c5705d2457b81fe7b5725 (diff) | |
Merge commit 'origin/HEAD' into test-merge
Manual fixup of include/asm-powerpc/pgtable-ppc64.h
Diffstat (limited to 'drivers/net/wireless/libertas/if_usb.c')
| -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 8032df72aaab..36288b29abf7 100644 --- a/drivers/net/wireless/libertas/if_usb.c +++ b/drivers/net/wireless/libertas/if_usb.c | |||
| @@ -925,6 +925,7 @@ static struct usb_driver if_usb_driver = { | |||
| 925 | .id_table = if_usb_table, | 925 | .id_table = if_usb_table, |
| 926 | .suspend = if_usb_suspend, | 926 | .suspend = if_usb_suspend, |
| 927 | .resume = if_usb_resume, | 927 | .resume = if_usb_resume, |
| 928 | .reset_resume = if_usb_resume, | ||
| 928 | }; | 929 | }; |
| 929 | 930 | ||
| 930 | static int __init if_usb_init_module(void) | 931 | static int __init if_usb_init_module(void) |