diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/net/wireless/Kconfig | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/net/wireless/Kconfig')
| -rw-r--r-- | drivers/net/wireless/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index 174e3442d519..f354bd4e121e 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig | |||
| @@ -274,12 +274,16 @@ source "drivers/net/wireless/b43legacy/Kconfig" | |||
| 274 | source "drivers/net/wireless/hostap/Kconfig" | 274 | source "drivers/net/wireless/hostap/Kconfig" |
| 275 | source "drivers/net/wireless/ipw2x00/Kconfig" | 275 | source "drivers/net/wireless/ipw2x00/Kconfig" |
| 276 | source "drivers/net/wireless/iwlwifi/Kconfig" | 276 | source "drivers/net/wireless/iwlwifi/Kconfig" |
| 277 | source "drivers/net/wireless/iwlegacy/Kconfig" | ||
| 277 | source "drivers/net/wireless/iwmc3200wifi/Kconfig" | 278 | source "drivers/net/wireless/iwmc3200wifi/Kconfig" |
| 278 | source "drivers/net/wireless/libertas/Kconfig" | 279 | source "drivers/net/wireless/libertas/Kconfig" |
| 279 | source "drivers/net/wireless/orinoco/Kconfig" | 280 | source "drivers/net/wireless/orinoco/Kconfig" |
| 280 | source "drivers/net/wireless/p54/Kconfig" | 281 | source "drivers/net/wireless/p54/Kconfig" |
| 281 | source "drivers/net/wireless/rt2x00/Kconfig" | 282 | source "drivers/net/wireless/rt2x00/Kconfig" |
| 283 | source "drivers/net/wireless/rtlwifi/Kconfig" | ||
| 284 | source "drivers/net/wireless/wl1251/Kconfig" | ||
| 282 | source "drivers/net/wireless/wl12xx/Kconfig" | 285 | source "drivers/net/wireless/wl12xx/Kconfig" |
| 283 | source "drivers/net/wireless/zd1211rw/Kconfig" | 286 | source "drivers/net/wireless/zd1211rw/Kconfig" |
| 287 | source "drivers/net/wireless/mwifiex/Kconfig" | ||
| 284 | 288 | ||
| 285 | endif # WLAN | 289 | endif # WLAN |