Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 304383
b: refs/heads/master
c: e0e3dad
h: refs/heads/master
i:
  304381: bb079ec
  304379: 5c0a58f
  304375: 3f6457b
  304367: 42343a3
  304351: a852183
  304319: 2b22070
  304255: 1544a74
  304127: 50942c5
v: v3
  • Loading branch information
Larry Finger authored and Greg Kroah-Hartman committed Apr 18, 2012
1 parent e6baab6 commit 2ae1124
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6b56d2459be6ce0e87b18a4276fef5d1bc265320
refs/heads/master: e0e3daddad36f8303ca3bbeab558ced00f4e7d3e
4 changes: 4 additions & 0 deletions trunk/drivers/staging/rtl8192e/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ if RTLLIB
config RTLLIB_CRYPTO_CCMP
tristate "Support for rtllib CCMP crypto"
depends on RTLLIB
select CRYPTO_AES
default y
---help---
CCMP crypto driver for rtllib.
Expand All @@ -23,6 +24,8 @@ config RTLLIB_CRYPTO_CCMP
config RTLLIB_CRYPTO_TKIP
tristate "Support for rtllib TKIP crypto"
depends on RTLLIB
select CRYPTO_ARC4
select CRYPTO_MICHAEL_MIC
default y
---help---
TKIP crypto driver for rtllib.
Expand All @@ -31,6 +34,7 @@ config RTLLIB_CRYPTO_TKIP

config RTLLIB_CRYPTO_WEP
tristate "Support for rtllib WEP crypto"
select CRYPTO_ARC4
depends on RTLLIB
default y
---help---
Expand Down

0 comments on commit 2ae1124

Please sign in to comment.