diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-14 16:46:25 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-14 16:46:25 -0400 |
| commit | 489f7ab6c18cdd64a2d444e056d60a0e722f4ad7 (patch) | |
| tree | 2c7ed6a0042dc15c91ece08c5a3866f610ddca6d /drivers/net/Kconfig | |
| parent | b322b7816908487c08b89b72f838174c37d8c836 (diff) | |
| parent | 82d27b2b2f3a80ffa7759a49b9cba39e47df476e (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (31 commits)
trivial: remove the trivial patch monkey's name from SubmittingPatches
trivial: Fix a typo in comment of addrconf_dad_start()
trivial: usb: fix missing space typo in doc
trivial: pci hotplug: adding __init/__exit macros to sgi_hotplug
trivial: Remove the hyphen from git commands
trivial: fix ETIMEOUT -> ETIMEDOUT typos
trivial: Kconfig: .ko is normally not included in module names
trivial: SubmittingPatches: fix typo
trivial: Documentation/dell_rbu.txt: fix typos
trivial: Fix Pavel's address in MAINTAINERS
trivial: ftrace:fix description of trace directory
trivial: unnecessary (void*) cast removal in sound/oss/msnd.c
trivial: input/misc: Fix typo in Kconfig
trivial: fix grammo in bus_for_each_dev() kerneldoc
trivial: rbtree.txt: fix rb_entry() parameters in sample code
trivial: spelling fix in ppc code comments
trivial: fix typo in bio_alloc kernel doc
trivial: Documentation/rbtree.txt: cleanup kerneldoc of rbtree.txt
trivial: Miscellaneous documentation typo fixes
trivial: fix typo milisecond/millisecond for documentation and source comments.
...
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index f3c4a3b910bb..3111b6c7cbc3 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -1880,7 +1880,7 @@ config FEC_MPC52xx | |||
| 1880 | ---help--- | 1880 | ---help--- |
| 1881 | This option enables support for the MPC5200's on-chip | 1881 | This option enables support for the MPC5200's on-chip |
| 1882 | Fast Ethernet Controller | 1882 | Fast Ethernet Controller |
| 1883 | If compiled as module, it will be called 'fec_mpc52xx.ko'. | 1883 | If compiled as module, it will be called fec_mpc52xx. |
| 1884 | 1884 | ||
| 1885 | config FEC_MPC52xx_MDIO | 1885 | config FEC_MPC52xx_MDIO |
| 1886 | bool "MPC52xx FEC MDIO bus driver" | 1886 | bool "MPC52xx FEC MDIO bus driver" |
| @@ -1892,7 +1892,7 @@ config FEC_MPC52xx_MDIO | |||
| 1892 | (Motorola? industry standard). | 1892 | (Motorola? industry standard). |
| 1893 | If your board uses an external PHY connected to FEC, enable this. | 1893 | If your board uses an external PHY connected to FEC, enable this. |
| 1894 | If not sure, enable. | 1894 | If not sure, enable. |
| 1895 | If compiled as module, it will be called 'fec_mpc52xx_phy.ko'. | 1895 | If compiled as module, it will be called fec_mpc52xx_phy. |
| 1896 | 1896 | ||
| 1897 | config NE_H8300 | 1897 | config NE_H8300 |
| 1898 | tristate "NE2000 compatible support for H8/300" | 1898 | tristate "NE2000 compatible support for H8/300" |