diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-05 14:18:03 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-05 14:18:03 -0700 |
| commit | e9563355ac1175dd3440dc2ea5c28b27ed51a283 (patch) | |
| tree | 8546d55832714b5d19ba4c7799266918ca04882e /drivers/staging/rtl8187se | |
| parent | cdd854bc42b5e6c79bbbc40c6600d995ffe6e747 (diff) | |
| parent | b12d1995f650e92f26184afd28e6cf40bf64467a (diff) | |
| download | talos-obmc-linux-e9563355ac1175dd3440dc2ea5c28b27ed51a283.tar.gz talos-obmc-linux-e9563355ac1175dd3440dc2ea5c28b27ed51a283.zip | |
Staging: Merge staging-next into Linus's tree
Conflicts:
drivers/staging/Kconfig
drivers/staging/batman-adv/bat_sysfs.c
drivers/staging/batman-adv/device.c
drivers/staging/batman-adv/hard-interface.c
drivers/staging/cx25821/cx25821-audups11.c
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8187se')
| -rw-r--r-- | drivers/staging/rtl8187se/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/rtl8187se/Kconfig b/drivers/staging/rtl8187se/Kconfig index 155a78e07405..1b3103fbf29c 100644 --- a/drivers/staging/rtl8187se/Kconfig +++ b/drivers/staging/rtl8187se/Kconfig @@ -4,6 +4,7 @@ config R8187SE select WIRELESS_EXT select WEXT_PRIV select EEPROM_93CX6 + select CRYPTO default N ---help--- If built as a module, it will be called r8187se.ko. |
