[kernel] r13695 - in dists/trunk/linux-2.6/debian: . config

[Maximilian Attems]

Author: maks
Date: Thu May 28 16:12:31 2009
New Revision: 13695

Log:
allow both backing stores for romfs

aka enabling ROMFS_BACKED_BY_BOTH

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Thu May 28 16:12:28 2009	(r13694)
+++ dists/trunk/linux-2.6/debian/changelog	Thu May 28 16:12:31 2009	(r13695)
@@ -20,7 +20,7 @@
     UIO_AEC, CRYPTO_ZLIB, REGULATOR_FIXED_VOLTAGE, NOP_USB_XCEIV,
     POHMELFS, FSCACHE, CACHEFILES, EXOFS, NFS_FSCACHE, AFS_FSCACHE,
     MTD_NAND_NANDSIM, STRIP_ASM_SYMS, FCOE_FNIC, USB_NET_CDC_EEM,
-    PCI_IOV, ASYNC_TX_DMA.
+    PCI_IOV, ASYNC_TX_DMA, ROMFS_BACKED_BY_BOTH.
   * [x86] set new DELL_WMI, EDAC_AMD8131, EDAC_AMD8111, X86_PAT, DMAR,
     X86_CPU_DEBUG.
   * [x86_64] set new CRYPTO_AES_NI_INTEL, X86_X2APIC.

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Thu May 28 16:12:28 2009	(r13694)
+++ dists/trunk/linux-2.6/debian/config/config	Thu May 28 16:12:31 2009	(r13695)
@@ -2716,6 +2716,11 @@
 ## file: fs/romfs/Kconfig
 ##
 CONFIG_ROMFS_FS=m
+## choice: RomFS backing stores
+# CONFIG_ROMFS_BACKED_BY_BLOCK is not set
+# CONFIG_ROMFS_BACKED_BY_MTD is not set
+CONFIG_ROMFS_BACKED_BY_BOTH=y
+## end choice
 
 ##
 ## file: fs/smbfs/Kconfig