diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-06 13:21:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-06 13:21:57 -0700 |
| commit | 15700770ef7c5d12e2f1659d2ddbeb3f658d9f37 (patch) | |
| tree | 7fa2f81c33c9efcb1a1568385beead75c5892cfb /drivers/mtd | |
| parent | 6de410c2b0cc055ae9ee640c84331f6a70878d9b (diff) | |
| parent | 11de39e2fbbc592018e0a231d0ee773653dcc8d6 (diff) | |
| download | talos-obmc-linux-15700770ef7c5d12e2f1659d2ddbeb3f658d9f37.tar.gz talos-obmc-linux-15700770ef7c5d12e2f1659d2ddbeb3f658d9f37.zip | |
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/mtd')
| -rw-r--r-- | drivers/mtd/devices/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/devices/Kconfig b/drivers/mtd/devices/Kconfig index 690c94236d7f..ff642f8fbee7 100644 --- a/drivers/mtd/devices/Kconfig +++ b/drivers/mtd/devices/Kconfig @@ -49,8 +49,8 @@ config MTD_MS02NV If you want to compile this driver as a module ( = code which can be inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module will - be called ms02-nv.o. + say M here and read <file:Documentation/kbuild/modules.txt>. + The module will be called ms02-nv.ko. config MTD_DATAFLASH tristate "Support for AT45xxx DataFlash" |
