The patch titled
fix the ROMFS_* dependencies
has been removed from the -mm tree. Its filename was
nommu-make-it-possible-for-romfs-to-use-mtd-devices-fix.patch
This patch was dropped because it was folded into
nommu-make-it-possible-for-romfs-to-use-mtd-devices.patch
------------------------------------------------------
Subject: fix the ROMFS_* dependencies
From: Adrian Bunk <[EMAIL PROTECTED]>
- adds the missing dependency of ROMFS_FS on BLOCK || MTD
- disallows the illegal ROMFS_FS=y, MTD=m, ROMFS_ON_MTD=y
- ensures that at least one of ROMFS_ON_BLOCK and ROMFS_ON_MTD is always
enabled:
- automatically enable ROMFS_ON_MTD if BLOCK=n
- automatically enable ROMFS_ON_BLOCK if ROMFS_ON_MTD=n
- if EMBEDDED=n, ROMFS_ON_BLOCK is always enabled
- the "(which may have been disabled)" that could now confuse
users has therefore been removed from the help text
Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]>
Acked-by: David Howells <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
fs/Kconfig | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff -puN fs/Kconfig~nommu-make-it-possible-for-romfs-to-use-mtd-devices-fix
fs/Kconfig
--- a/fs/Kconfig~nommu-make-it-possible-for-romfs-to-use-mtd-devices-fix
+++ a/fs/Kconfig
@@ -482,6 +482,7 @@ endif
config ROMFS_FS
tristate "ROM file system support"
+ depends on BLOCK || MTD
---help---
This is a very small read-only file system mainly intended for
initial ram disks of installation disks, but it could be used for
@@ -497,8 +498,9 @@ config ROMFS_FS
answer N.
config ROMFS_ON_BLOCK
- bool "Block device-backed ROM file system support"
+ bool "Block device-backed ROM file system support" if (ROMFS_ON_MTD &&
EMBEDDED)
depends on ROMFS_FS && BLOCK
+ default y
help
This permits ROMFS to use block devices buffered through the page
cache as the medium from which to retrieve data. It does not allow
@@ -507,14 +509,15 @@ config ROMFS_ON_BLOCK
If unsure, answer Y.
config ROMFS_ON_MTD
- bool "MTD-backed ROM file system support"
- depends on ROMFS_FS && MTD
+ bool "MTD-backed ROM file system support" if BLOCK
+ depends on ROMFS_FS
+ depends on MTD=y || (ROMFS_FS=m && MTD)
+ default y
help
This permits ROMFS to use MTD based devices directly, without the
- intercession of the block layer (which may have been disabled). It
- also allows direct mapping of MTD devices through romfs files under
- NOMMU conditions if the underlying device is directly addressable by
- the CPU.
+ intercession of the block layer. It also allows direct mapping of
+ MTD devices through romfs files under NOMMU conditions if the
+ underlying device is directly addressable by the CPU.
If unsure, answer Y.
_
Patches currently in -mm which might be from [EMAIL PROTECTED] are
origin.patch
remove-arch-i386-kernel-tscccustom_sched_clock.patch
drivers-cpuidle-make-code-static.patch
git-drm.patch
make-drivers-char-drm-drm_vmcdrm_io_prot-static.patch
git-dvb.patch
saa7134-fix-modules=n-compilation.patch
git-gfs2-nmw.patch
git-ieee1394.patch
kconfig-abort-configuration-with-recursive-dependencies.patch
remove-fs-jffs2-ioctlc.patch
nommu-make-it-possible-for-romfs-to-use-mtd-devices.patch
nommu-make-it-possible-for-romfs-to-use-mtd-devices-fix.patch
git-ubi.patch
drivers-net-vioc-possible-cleanups.patch
drivers-net-bonding-bond_maincmake-3-functions-static.patch
net-uninline-skb_put-fix.patch
drivers-scsi-small-cleanups.patch
drivers-scsi-advansysc-cleanups.patch
megaraid-fix-warnings-when-config_proc_fs=n.patch
drivers-scsi-dpt_i2oc-remove-dead-code.patch
drivers-scsi-aic7xxx-make-functions-static.patch
drivers-scsi-wd33c93c-cleanups.patch
drivers-scsi-qla4xxx-possible-cleanups.patch
make-seagate_st0x_detect-static.patch
drivers-scsi-aacraid-cleanups.patch
remove-the-broken-scsi_acornscsi_3-driver.patch
git-unionfs.patch
git-wireless.patch
git-ipwireless_cs.patch
arch-i386-kernel-alternativec-should-include-asm-bugsh.patch
make-struct-vmi_ops-static.patch
i386-asm-offsetsc-workaround-for-a-wmissing-prototypes-warning.patch
lguest-kconfig-and-headers-fix.patch
proper-prototype-for-hugetlb_get_unmapped_area.patch
mm-slabc-proper-prototypes.patch
filesystem-disk-errors-at-boot-time-caused-by-probe.patch
kill-net-rxrpc-rxrpc_symsc.patch
drivers-char-hvc_consolec-cleanups.patch
init-do_mountsc-proper-prepare_namespace-prototype.patch
the-scheduled-removal-of-obsolete_oss-options.patch
ext2-reservations.patch
drivers-edac-make-code-static.patch
linux-kernel-markers-kconfig-menus.patch
linux-kernel-markers-architecture-independant-code.patch
linux-kernel-markers-i386-optimization.patch
readahead-events-accounting.patch
reiser4-export-remove_from_page_cache.patch
reiser4.patch
fbdev-display-class-fix.patch
fbdev-mm-deferred-io-support-fix.patch
fbdev-hecuba-framebuffer-driver-fix.patch
slim-main-patch.patch
slim-debug-output.patch
i386-enable-4k-stacks-by-default.patch
mutex-subsystem-synchro-test-module.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
