diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-24 16:41:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-24 16:41:39 -0400 |
| commit | 229aebb873e29726b91e076161649cf45154b0bf (patch) | |
| tree | acc02a3702215bce8d914f4c8cc3d7a1382b1c67 /drivers/net/wireless/p54/Kconfig | |
| parent | 8de547e1824437f3c6af180d3ed2162fa4b3f389 (diff) | |
| parent | 50a23e6eec6f20d55a3a920e47adb455bff6046e (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
Update broken web addresses in arch directory.
Update broken web addresses in the kernel.
Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
Revert "Fix typo: configuation => configuration" partially
ida: document IDA_BITMAP_LONGS calculation
ext2: fix a typo on comment in ext2/inode.c
drivers/scsi: Remove unnecessary casts of private_data
drivers/s390: Remove unnecessary casts of private_data
net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
drivers/infiniband: Remove unnecessary casts of private_data
drivers/gpu/drm: Remove unnecessary casts of private_data
kernel/pm_qos_params.c: Remove unnecessary casts of private_data
fs/ecryptfs: Remove unnecessary casts of private_data
fs/seq_file.c: Remove unnecessary casts of private_data
arm: uengine.c: remove C99 comments
arm: scoop.c: remove C99 comments
Fix typo configue => configure in comments
Fix typo: configuation => configuration
Fix typo interrest[ing|ed] => interest[ing|ed]
Fix various typos of valid in comments
...
Fix up trivial conflicts in:
drivers/char/ipmi/ipmi_si_intf.c
drivers/usb/gadget/rndis.c
net/irda/irnet/irnet_ppp.c
Diffstat (limited to 'drivers/net/wireless/p54/Kconfig')
| -rw-r--r-- | drivers/net/wireless/p54/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/p54/Kconfig b/drivers/net/wireless/p54/Kconfig index e5f45cb2a7a2..25f965ffc889 100644 --- a/drivers/net/wireless/p54/Kconfig +++ b/drivers/net/wireless/p54/Kconfig | |||
| @@ -9,7 +9,7 @@ config P54_COMMON | |||
| 9 | also need to be enabled in order to support any devices. | 9 | also need to be enabled in order to support any devices. |
| 10 | 10 | ||
| 11 | These devices require softmac firmware which can be found at | 11 | These devices require softmac firmware which can be found at |
| 12 | http://prism54.org/ | 12 | <http://wireless.kernel.org/en/users/Drivers/p54> |
| 13 | 13 | ||
| 14 | If you choose to build a module, it'll be called p54common. | 14 | If you choose to build a module, it'll be called p54common. |
| 15 | 15 | ||
| @@ -21,7 +21,7 @@ config P54_USB | |||
| 21 | This driver is for USB isl38xx based wireless cards. | 21 | This driver is for USB isl38xx based wireless cards. |
| 22 | 22 | ||
| 23 | These devices require softmac firmware which can be found at | 23 | These devices require softmac firmware which can be found at |
| 24 | http://prism54.org/ | 24 | <http://wireless.kernel.org/en/users/Drivers/p54> |
| 25 | 25 | ||
| 26 | If you choose to build a module, it'll be called p54usb. | 26 | If you choose to build a module, it'll be called p54usb. |
| 27 | 27 | ||
| @@ -35,7 +35,7 @@ config P54_PCI | |||
| 35 | supported by the fullmac driver/firmware. | 35 | supported by the fullmac driver/firmware. |
| 36 | 36 | ||
| 37 | This driver requires softmac firmware which can be found at | 37 | This driver requires softmac firmware which can be found at |
| 38 | http://prism54.org/ | 38 | <http://wireless.kernel.org/en/users/Drivers/p54> |
| 39 | 39 | ||
| 40 | If you choose to build a module, it'll be called p54pci. | 40 | If you choose to build a module, it'll be called p54pci. |
| 41 | 41 | ||