diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-15 06:02:23 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-15 06:02:23 -0400 |
| commit | 9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb (patch) | |
| tree | 8d104ec2a459346b99413b0b77421ca7b9936c1a /drivers/net/wireless/iwlwifi | |
| parent | ca44d6e60f9de26281fda203f58b570e1748c015 (diff) | |
| parent | 45e3e1935e2857c54783291107d33323b3ef33c8 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/scsi/fcoe/fcoe.c
net/core/drop_monitor.c
net/core/net-traces.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
| -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 029ccb6bdbaa..e092af09d6bf 100644 --- a/drivers/net/wireless/iwlwifi/Kconfig +++ b/drivers/net/wireless/iwlwifi/Kconfig | |||
| @@ -70,7 +70,7 @@ config IWLAGN | |||
| 70 | If you want to compile the driver as a module ( = code which can be | 70 | If you want to compile the driver as a module ( = code which can be |
| 71 | inserted in and removed from the running kernel whenever you want), | 71 | inserted in and removed from the running kernel whenever you want), |
| 72 | say M here and read <file:Documentation/kbuild/modules.txt>. The | 72 | say M here and read <file:Documentation/kbuild/modules.txt>. The |
| 73 | module will be called iwlagn.ko. | 73 | module will be called iwlagn. |
| 74 | 74 | ||
| 75 | 75 | ||
| 76 | config IWL4965 | 76 | config IWL4965 |
| @@ -108,7 +108,7 @@ config IWL3945 | |||
| 108 | If you want to compile the driver as a module ( = code which can be | 108 | If you want to compile the driver as a module ( = code which can be |
| 109 | inserted in and removed from the running kernel whenever you want), | 109 | inserted in and removed from the running kernel whenever you want), |
| 110 | say M here and read <file:Documentation/kbuild/modules.txt>. The | 110 | say M here and read <file:Documentation/kbuild/modules.txt>. The |
| 111 | module will be called iwl3945.ko. | 111 | module will be called iwl3945. |
| 112 | 112 | ||
| 113 | config IWL3945_SPECTRUM_MEASUREMENT | 113 | config IWL3945_SPECTRUM_MEASUREMENT |
| 114 | bool "Enable Spectrum Measurement in iwl3945 driver" | 114 | bool "Enable Spectrum Measurement in iwl3945 driver" |