diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-23 21:15:32 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-23 21:17:36 -0700 |
| commit | a813833df88e7489fe637d6479a79bd9796f77a4 (patch) | |
| tree | 936826ff0d57812aa46e983d4e8898affb43ec94 /drivers/staging/usbip | |
| parent | ac657d5884f31a16c900b2ad1098e01ec7fa4145 (diff) | |
| parent | bca54c0184b3b3913ee9660f01e42ccb40abdac4 (diff) | |
| download | blackbird-obmc-linux-a813833df88e7489fe637d6479a79bd9796f77a4.tar.gz blackbird-obmc-linux-a813833df88e7489fe637d6479a79bd9796f77a4.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lwfinger/r8192E into staging-next
* git://git.kernel.org/pub/scm/linux/kernel/git/lwfinger/r8192E: (61 commits)
staging: rtl8192e: Fix compilation warnings
staging: rtl8192e: Fix unload/reload problem
staging: rtl8192e: Remove dead code associated with CONFIG_RTL_RFKILL
staging: rtl8192e: Remove conditional code associated with EEPROM_OLD_FORMAT_SUPPORT
staging: rtl8192e: Remove dead code associated with EFUSE_REPG_WORKAROUND
staging: rtl8192e: Remove LOOP_TEST as parameter
staging: rtl8192e: Remove dead code associated with CONFIG_FW_SETCHAN
staging: rtl8192e: Remove dead code associated with CONFIG_RTLWIFI_DEBUGFS
staging: rtl8192e: Remove dead code associated with _RTL8192_EXT_PATCH_
staging: rtl8192e: Remove ifdefs for CONFIG_RTLLIB_DEBUG
staging: rtl8192e: Remove dead code associated with RTL819x_DEBUG
staging: rtl8192e: Remove dead code associated with _ENABLE_SW_BEACON
staging: rtl8192e: Remove dead code associated with CONFIG_CRYPTO_HMAC
staging: rtl8192e: Remove dead code associated with CONFIG_BT_30
staging: rtl8192e: Remove dead code associated with ENABLE_NULL_PT_DEBUG
staging: rtl8192e: Remove dead code associated with CONFIG_64BIT_DMA
staging: rtl8192e: Remove dead code associated with CONFIG_RTLLIB_CRYPT_TKIP
staging: rtl8192e: Remove dead code associated with IRQF_SHARED
staging: rtl8192e: Remove dead code associated with CONFIG_CFG_80211
staging: rtl8192e: Remove dead code associated with BUILT_IN_CRYPTO
...
Diffstat (limited to 'drivers/staging/usbip')
| -rw-r--r-- | drivers/staging/usbip/userspace/src/utils.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/usbip/userspace/src/utils.h b/drivers/staging/usbip/userspace/src/utils.h index fdcb14dc0fb8..5916fd3e02a6 100644 --- a/drivers/staging/usbip/userspace/src/utils.h +++ b/drivers/staging/usbip/userspace/src/utils.h @@ -22,3 +22,4 @@ int modify_match_busid(char *busid, int add); #endif /* __UTILS_H */ + |
