diff options
author | David S. Miller <davem@davemloft.net> | 2008-03-26 19:09:43 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-03-26 19:09:43 -0400 |
commit | 0e5606e4f46b7cf52dd445af01e71ed9dbb7f735 (patch) | |
tree | b3a5e9a525de646bb353b2d9d5db305fdd3fd54e /drivers/net/wireless/iwlwifi/Kconfig | |
parent | 7c0ecc4c4f8fd90988aab8a95297b9c0038b6160 (diff) | |
parent | 7a193a5df7580957c918269e4ba2fccbe4141cb4 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/Kconfig')
-rw-r--r-- | drivers/net/wireless/iwlwifi/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig index d1af938b9aa6..b79a35a40ab6 100644 --- a/drivers/net/wireless/iwlwifi/Kconfig +++ b/drivers/net/wireless/iwlwifi/Kconfig | |||
@@ -20,7 +20,7 @@ config IWL4965 | |||
20 | runs. | 20 | runs. |
21 | 21 | ||
22 | If you want to compile the driver as a module ( = code which can be | 22 | If you want to compile the driver as a module ( = code which can be |
23 | inserted in and remvoed from the running kernel whenever you want), | 23 | inserted in and removed from the running kernel whenever you want), |
24 | say M here and read <file:Documentation/kbuild/modules.txt>. The | 24 | say M here and read <file:Documentation/kbuild/modules.txt>. The |
25 | module will be called iwl4965.ko. | 25 | module will be called iwl4965.ko. |
26 | 26 | ||
@@ -101,7 +101,7 @@ config IWL3945 | |||
101 | runs. | 101 | runs. |
102 | 102 | ||
103 | If you want to compile the driver as a module ( = code which can be | 103 | If you want to compile the driver as a module ( = code which can be |
104 | inserted in and remvoed from the running kernel whenever you want), | 104 | inserted in and removed from the running kernel whenever you want), |
105 | say M here and read <file:Documentation/kbuild/modules.txt>. The | 105 | say M here and read <file:Documentation/kbuild/modules.txt>. The |
106 | module will be called iwl3945.ko. | 106 | module will be called iwl3945.ko. |
107 | 107 | ||