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/Kconfig | |
| 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/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 fb7541c28e58..5bc00db21b24 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig | |||
| @@ -310,7 +310,7 @@ config PRISM54 | |||
| 310 | If you want to compile the driver as a module ( = code which can be | 310 | If you want to compile the driver as a module ( = code which can be |
| 311 | inserted in and removed from the running kernel whenever you want), | 311 | inserted in and removed from the running kernel whenever you want), |
| 312 | say M here and read <file:Documentation/kbuild/modules.txt>. | 312 | say M here and read <file:Documentation/kbuild/modules.txt>. |
| 313 | The module will be called prism54.ko. | 313 | The module will be called prism54. |
| 314 | 314 | ||
| 315 | config USB_ZD1201 | 315 | config USB_ZD1201 |
| 316 | tristate "USB ZD1201 based Wireless device support" | 316 | tristate "USB ZD1201 based Wireless device support" |