diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-27 21:01:13 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-27 21:01:13 -0400 |
| commit | ed85f2c3b2b72bd20f617ac749f5c22be8d0f66e (patch) | |
| tree | cb077293e1b36a5d6e2a138deb9663078a2d850e /drivers/net/wireless/Kconfig | |
| parent | bc09dff198e67a98a82c42000006b39f6d502031 (diff) | |
| parent | e5225b397308f9eea86327293b73dc88068e0179 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.26
Diffstat (limited to 'drivers/net/wireless/Kconfig')
| -rw-r--r-- | drivers/net/wireless/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index f4ca6fd4a29f..9cba8ea58ca8 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig | |||
| @@ -284,7 +284,7 @@ config LIBERTAS_USB | |||
| 284 | 284 | ||
| 285 | config LIBERTAS_CS | 285 | config LIBERTAS_CS |
| 286 | tristate "Marvell Libertas 8385 CompactFlash 802.11b/g cards" | 286 | tristate "Marvell Libertas 8385 CompactFlash 802.11b/g cards" |
| 287 | depends on LIBERTAS && PCMCIA && EXPERIMENTAL | 287 | depends on LIBERTAS && PCMCIA |
| 288 | select FW_LOADER | 288 | select FW_LOADER |
| 289 | ---help--- | 289 | ---help--- |
| 290 | A driver for Marvell Libertas 8385 CompactFlash devices. | 290 | A driver for Marvell Libertas 8385 CompactFlash devices. |