diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-06 16:21:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-06 16:21:57 -0400 |
| commit | 15700770ef7c5d12e2f1659d2ddbeb3f658d9f37 (patch) | |
| tree | 7fa2f81c33c9efcb1a1568385beead75c5892cfb /drivers/net/Kconfig | |
| parent | 6de410c2b0cc055ae9ee640c84331f6a70878d9b (diff) | |
| parent | 11de39e2fbbc592018e0a231d0ee773653dcc8d6 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (38 commits)
kconfig: fix mconf segmentation fault
kbuild: enable use of code from a different dir
kconfig: error out if recursive dependencies are found
kbuild: scripts/basic/fixdep segfault on pathological string-o-death
kconfig: correct minor typo in Kconfig warning message.
kconfig: fix path to modules.txt in Kconfig help
usr/Kconfig: fix typo
kernel-doc: alphabetically-sorted entries in index.html of 'htmldocs'
kbuild: be more explicit on missing .config file
kbuild: clarify the creation of the LOCALVERSION_AUTO string.
kbuild: propagate errors from find in scripts/gen_initramfs_list.sh
kconfig: refer to qt3 if we cannot find qt libraries
kbuild: handle compressed cpio initramfs-es
kbuild: ignore section mismatch warning for references from .paravirtprobe to .init.text
kbuild: remove stale comment in modpost.c
kbuild/mkuboot.sh: allow spaces in CROSS_COMPILE
kbuild: fix make mrproper for Documentation/DocBook/man
kbuild: remove kconfig binaries during make mrproper
kconfig/menuconfig: do not hardcode '.config'
kbuild: override build timestamp & version
...
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 69dba62e0bad..9e6933a5088e 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -833,8 +833,8 @@ config SMC91X | |||
| 833 | This driver is also available as a module ( = code which can be | 833 | This driver is also available as a module ( = code which can be |
| 834 | inserted in and removed from the running kernel whenever you want). | 834 | inserted in and removed from the running kernel whenever you want). |
| 835 | The module will be called smc91x. If you want to compile it as a | 835 | The module will be called smc91x. If you want to compile it as a |
| 836 | module, say M here and read <file:Documentation/modules.txt> as well | 836 | module, say M here and read <file:Documentation/kbuild/modules.txt> |
| 837 | as <file:Documentation/networking/net-modules.txt>. | 837 | as well as <file:Documentation/networking/net-modules.txt>. |
| 838 | 838 | ||
| 839 | config SMC9194 | 839 | config SMC9194 |
| 840 | tristate "SMC 9194 support" | 840 | tristate "SMC 9194 support" |
| @@ -889,7 +889,7 @@ config SMC911X | |||
| 889 | 889 | ||
| 890 | This driver is also available as a module. The module will be | 890 | This driver is also available as a module. The module will be |
| 891 | called smc911x. If you want to compile it as a module, say M | 891 | called smc911x. If you want to compile it as a module, say M |
| 892 | here and read <file:Documentation/modules.txt> | 892 | here and read <file:Documentation/kbuild/modules.txt> |
| 893 | 893 | ||
| 894 | config NET_VENDOR_RACAL | 894 | config NET_VENDOR_RACAL |
| 895 | bool "Racal-Interlan (Micom) NI cards" | 895 | bool "Racal-Interlan (Micom) NI cards" |