diff --exclude '*.swp' --exclude '*.orig' --exclude '*~' -Nur linux-2.4.19/arch/alpha/defconfig linux-2.4.19-memory_bus/arch/alpha/defconfig
--- linux-2.4.19/arch/alpha/defconfig	2002-11-06 13:19:24.000000000 -0500
+++ linux-2.4.19-memory_bus/arch/alpha/defconfig	2002-11-06 13:20:26.000000000 -0500
@@ -51,6 +51,7 @@
 # CONFIG_ALPHA_TAKARA is not set
 # CONFIG_ALPHA_TITAN is not set
 # CONFIG_ALPHA_WILDFIRE is not set
+CONFIG_MEMORY_BUS=y
 CONFIG_ISA=y
 CONFIG_EISA=y
 # CONFIG_SBUS is not set
diff --exclude '*.swp' --exclude '*.orig' --exclude '*~' -Nur linux-2.4.19/arch/arm/defconfig linux-2.4.19-memory_bus/arch/arm/defconfig
--- linux-2.4.19/arch/arm/defconfig	2001-05-19 20:43:05.000000000 -0400
+++ linux-2.4.19-memory_bus/arch/arm/defconfig	2002-11-06 13:20:34.000000000 -0500
@@ -71,6 +71,7 @@
 # CONFIG_ANGELBOOT is not set
 CONFIG_PCI_INTEGRATOR=y
 CONFIG_PCI=y
+CONFIG_MEMORY_BUS=y
 # CONFIG_ISA is not set
 # CONFIG_ISA_DMA is not set
 CONFIG_PCI_NAMES=y
diff --exclude '*.swp' --exclude '*.orig' --exclude '*~' -Nur linux-2.4.19/arch/cris/defconfig linux-2.4.19-memory_bus/arch/cris/defconfig
--- linux-2.4.19/arch/cris/defconfig	2002-08-02 20:39:42.000000000 -0400
+++ linux-2.4.19-memory_bus/arch/cris/defconfig	2002-11-06 13:21:41.000000000 -0500
@@ -95,6 +95,7 @@
 # CONFIG_ETRAX_IDE is not set
 CONFIG_ETRAX_AXISFLASHMAP=y
 CONFIG_ETRAX_PTABLE_SECTOR=65536
+CONFIG_MEMORY_BUS=y
 CONFIG_MTD=y
 CONFIG_MTD_CFI=y
 # CONFIG_MTD_CFI_INTELEXT is not set
diff --exclude '*.swp' --exclude '*.orig' --exclude '*~' -Nur linux-2.4.19/arch/i386/defconfig linux-2.4.19-memory_bus/arch/i386/defconfig
--- linux-2.4.19/arch/i386/defconfig	2002-08-02 20:39:42.000000000 -0400
+++ linux-2.4.19-memory_bus/arch/i386/defconfig	2002-11-06 13:21:50.000000000 -0500
@@ -71,6 +71,7 @@
 CONFIG_NET=y
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_LOCAL_APIC=y
+CONFIG_MEMORY_BUS=y
 CONFIG_PCI=y
 # CONFIG_PCI_GOBIOS is not set
 # CONFIG_PCI_GODIRECT is not set
diff --exclude '*.swp' --exclude '*.orig' --exclude '*~' -Nur linux-2.4.19/arch/ia64/defconfig linux-2.4.19-memory_bus/arch/ia64/defconfig
--- linux-2.4.19/arch/ia64/defconfig	2002-08-02 20:39:42.000000000 -0400
+++ linux-2.4.19-memory_bus/arch/ia64/defconfig	2002-11-06 13:21:53.000000000 -0500
@@ -65,6 +65,7 @@
 # CONFIG_ACPI_EC is not set
 # CONFIG_ACPI_CMBATT is not set
 # CONFIG_ACPI_THERMAL is not set
+CONFIG_MEMORY_BUS=y
 CONFIG_PCI=y
 CONFIG_PCI_NAMES=y
 # CONFIG_HOTPLUG is not set
diff --exclude '*.swp' --exclude '*.orig' --exclude '*~' -Nur linux-2.4.19/arch/m68k/defconfig linux-2.4.19-memory_bus/arch/m68k/defconfig
--- linux-2.4.19/arch/m68k/defconfig	2000-06-19 15:56:08.000000000 -0400
+++ linux-2.4.19-memory_bus/arch/m68k/defconfig	2002-11-06 13:22:02.000000000 -0500
@@ -24,6 +24,7 @@
 # CONFIG_SUN3X is not set
 # CONFIG_SUN3 is not set
 # CONFIG_Q40 is not set
+CONFIG_MEMORY_BUS=y
 
 #
 # Processor type
diff --exclude '*.swp' --exclude '*.orig' --exclude '*~' -Nur linux-2.4.19/arch/mips/defconfig linux-2.4.19-memory_bus/arch/mips/defconfig
--- linux-2.4.19/arch/mips/defconfig	2002-08-02 20:39:43.000000000 -0400
+++ linux-2.4.19-memory_bus/arch/mips/defconfig	2002-11-06 13:22:12.000000000 -0500
@@ -90,6 +90,7 @@
 CONFIG_FORWARD_KEYBOARD=y
 # CONFIG_ARC_CONSOLE is not set
 CONFIG_NET=y
+CONFIG_MEMORY_BUS=y
 # CONFIG_PCI is not set
 # CONFIG_ISA is not set
 # CONFIG_EISA is not set
diff --exclude '*.swp' --exclude '*.orig' --exclude '*~' -Nur linux-2.4.19/arch/mips64/defconfig linux-2.4.19-memory_bus/arch/mips64/defconfig
--- linux-2.4.19/arch/mips64/defconfig	2002-08-02 20:39:43.000000000 -0400
+++ linux-2.4.19-memory_bus/arch/mips64/defconfig	2002-11-06 13:22:08.000000000 -0500
@@ -35,6 +35,7 @@
 CONFIG_BOOT_ELF64=y
 CONFIG_ARC64=y
 CONFIG_MAPPED_PCI_IO=y
+CONFIG_MEMORY_BUS=y
 CONFIG_PCI=y
 CONFIG_QL_ISP_A64=y
 CONFIG_L1_CACHE_SHIFT=7
diff --exclude '*.swp' --exclude '*.orig' --exclude '*~' -Nur linux-2.4.19/arch/parisc/defconfig linux-2.4.19-memory_bus/arch/parisc/defconfig
--- linux-2.4.19/arch/parisc/defconfig	2000-12-05 15:29:39.000000000 -0500
+++ linux-2.4.19-memory_bus/arch/parisc/defconfig	2002-11-06 13:22:20.000000000 -0500
@@ -17,6 +17,7 @@
 CONFIG_GSC=y
 CONFIG_IOMMU_CCIO=y
 CONFIG_GSC_LASI=y
+CONFIG_MEMORY_BUS=y
 CONFIG_PCI=y
 CONFIG_GSC_DINO=y
 CONFIG_PCI_LBA=y
diff --exclude '*.swp' --exclude '*.orig' --exclude '*~' -Nur linux-2.4.19/arch/ppc/defconfig linux-2.4.19-memory_bus/arch/ppc/defconfig
--- linux-2.4.19/arch/ppc/defconfig	2002-02-25 14:37:55.000000000 -0500
+++ linux-2.4.19-memory_bus/arch/ppc/defconfig	2002-11-06 13:22:27.000000000 -0500
@@ -47,6 +47,7 @@
 # CONFIG_EISA is not set
 # CONFIG_SBUS is not set
 # CONFIG_MCA is not set
+CONFIG_MEMORY_BUS=y
 CONFIG_PCI=y
 CONFIG_NET=y
 CONFIG_SYSCTL=y
diff --exclude '*.swp' --exclude '*.orig' --exclude '*~' -Nur linux-2.4.19/arch/ppc64/defconfig linux-2.4.19-memory_bus/arch/ppc64/defconfig
--- linux-2.4.19/arch/ppc64/defconfig	2002-08-02 20:39:43.000000000 -0400
+++ linux-2.4.19-memory_bus/arch/ppc64/defconfig	2002-11-06 13:22:24.000000000 -0500
@@ -40,6 +40,7 @@
 # CONFIG_SBUS is not set
 # CONFIG_MCA is not set
 # CONFIG_EISA is not set
+CONFIG_MEMORY_BUS=y
 CONFIG_PCI=y
 CONFIG_NET=y
 CONFIG_SYSCTL=y
diff --exclude '*.swp' --exclude '*.orig' --exclude '*~' -Nur linux-2.4.19/arch/s390/defconfig linux-2.4.19-memory_bus/arch/s390/defconfig
--- linux-2.4.19/arch/s390/defconfig	2002-08-02 20:39:43.000000000 -0400
+++ linux-2.4.19-memory_bus/arch/s390/defconfig	2002-11-06 13:22:38.000000000 -0500
@@ -9,6 +9,7 @@
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 # CONFIG_GENERIC_BUST_SPINLOCK is not set
 CONFIG_ARCH_S390=y
+CONFIG_MEMORY_BUS=y
 
 #
 # Code maturity level options
diff --exclude '*.swp' --exclude '*.orig' --exclude '*~' -Nur linux-2.4.19/arch/s390x/defconfig linux-2.4.19-memory_bus/arch/s390x/defconfig
--- linux-2.4.19/arch/s390x/defconfig	2002-08-02 20:39:43.000000000 -0400
+++ linux-2.4.19-memory_bus/arch/s390x/defconfig	2002-11-06 13:22:43.000000000 -0500
@@ -9,6 +9,7 @@
 # CONFIG_GENERIC_BUST_SPINLOCK is not set
 CONFIG_ARCH_S390=y
 CONFIG_ARCH_S390X=y
+CONFIG_MEMORY_BUS=y
 
 #
 # Code maturity level options
diff --exclude '*.swp' --exclude '*.orig' --exclude '*~' -Nur linux-2.4.19/arch/sh/defconfig linux-2.4.19-memory_bus/arch/sh/defconfig
--- linux-2.4.19/arch/sh/defconfig	2001-10-15 16:36:48.000000000 -0400
+++ linux-2.4.19-memory_bus/arch/sh/defconfig	2002-11-06 13:23:12.000000000 -0500
@@ -49,6 +49,7 @@
 # CONFIG_KCORE_AOUT is not set
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_MISC is not set
+CONFIG_MEMORY_BUS=y
 
 #
 # Parallel port support
diff --exclude '*.swp' --exclude '*.orig' --exclude '*~' -Nur linux-2.4.19/arch/sparc/defconfig linux-2.4.19-memory_bus/arch/sparc/defconfig
--- linux-2.4.19/arch/sparc/defconfig	2002-08-02 20:39:43.000000000 -0400
+++ linux-2.4.19-memory_bus/arch/sparc/defconfig	2002-11-06 13:23:19.000000000 -0500
@@ -43,6 +43,7 @@
 CONFIG_SUN_PM=y
 # CONFIG_SUN4 is not set
 # CONFIG_PCI is not set
+CONFIG_MEMORY_BUS=y
 CONFIG_SUN_OPENPROMFS=m
 CONFIG_NET=y
 CONFIG_SYSVIPC=y
diff --exclude '*.swp' --exclude '*.orig' --exclude '*~' -Nur linux-2.4.19/arch/sparc64/defconfig linux-2.4.19-memory_bus/arch/sparc64/defconfig
--- linux-2.4.19/arch/sparc64/defconfig	2002-08-02 20:39:43.000000000 -0400
+++ linux-2.4.19-memory_bus/arch/sparc64/defconfig	2002-11-06 13:23:15.000000000 -0500
@@ -42,6 +42,7 @@
 CONFIG_SUN_CONSOLE=y
 CONFIG_SUN_AUXIO=y
 CONFIG_SUN_IO=y
+CONFIG_MEMORY_BUS=y
 CONFIG_PCI=y
 CONFIG_RTC=y
 # CONFIG_PCI_NAMES is not set
diff --exclude '*.swp' --exclude '*.orig' --exclude '*~' -Nur linux-2.4.19/drivers/mtd/chips/Config.in linux-2.4.19-memory_bus/drivers/mtd/chips/Config.in
--- linux-2.4.19/drivers/mtd/chips/Config.in	2001-10-04 18:13:18.000000000 -0400
+++ linux-2.4.19-memory_bus/drivers/mtd/chips/Config.in	2002-11-06 13:27:39.000000000 -0500
@@ -6,52 +6,53 @@
 
 comment 'RAM/ROM/Flash chip drivers'
 
-dep_tristate '  Detect flash chips by Common Flash Interface (CFI) probe' CONFIG_MTD_CFI $CONFIG_MTD
-#dep_tristate '  Detect non-CFI Intel-compatible flash chips' CONFIG_MTD_INTELPROBE $CONFIG_MTD
-dep_tristate '  Detect non-CFI AMD/JEDEC-compatible flash chips' CONFIG_MTD_JEDECPROBE $CONFIG_MTD
-
-if [ "$CONFIG_MTD_CFI" = "y" -o "$CONFIG_MTD_INTELPROBE" = "y" -o "$CONFIG_MTD_JEDECPROBE" = "y" ]; then
-   define_bool CONFIG_MTD_GEN_PROBE y
-else
-   if [ "$CONFIG_MTD_CFI" = "m" -o "$CONFIG_MTD_INTELPROBE" = "m" -o "$CONFIG_MTD_JEDECPROBE" = "m" ]; then
-      define_bool CONFIG_MTD_GEN_PROBE m
+if [ "$CONFIG_MEMORY_BUS" = "y" ]; then
+   dep_tristate '  Detect flash chips by Common Flash Interface (CFI) probe' CONFIG_MTD_CFI $CONFIG_MTD
+   #dep_tristate '  Detect non-CFI Intel-compatible flash chips' CONFIG_MTD_INTELPROBE $CONFIG_MTD
+   dep_tristate '  Detect non-CFI AMD/JEDEC-compatible flash chips' CONFIG_MTD_JEDECPROBE $CONFIG_MTD
+
+   if [ "$CONFIG_MTD_CFI" = "y" -o "$CONFIG_MTD_INTELPROBE" = "y" -o "$CONFIG_MTD_JEDECPROBE" = "y" ]; then
+      define_bool CONFIG_MTD_GEN_PROBE y
    else
-      define_bool CONFIG_MTD_GEN_PROBE n
+      if [ "$CONFIG_MTD_CFI" = "m" -o "$CONFIG_MTD_INTELPROBE" = "m" -o "$CONFIG_MTD_JEDECPROBE" = "m" ]; then
+         define_bool CONFIG_MTD_GEN_PROBE m
+      else
+         define_bool CONFIG_MTD_GEN_PROBE n
+      fi
    fi
-fi
-if [ "$CONFIG_MTD_GEN_PROBE" = "y" -o "$CONFIG_MTD_GEN_PROBE" = "m" ]; then
-   bool '  Flash chip driver advanced configuration options' CONFIG_MTD_CFI_ADV_OPTIONS
-   if [ "$CONFIG_MTD_CFI_ADV_OPTIONS" = "y" ]; then
-     choice 'Flash cmd/query data swapping'			\
-	"NO			CONFIG_MTD_CFI_NOSWAP		\
-	 BIG_ENDIAN_BYTE	CONFIG_MTD_CFI_BE_BYTE_SWAP	\
-	 LITTLE_ENDIAN_BYTE	CONFIG_MTD_CFI_LE_BYTE_SWAP"	NO
-     bool '  Specific CFI Flash geometry selection' CONFIG_MTD_CFI_GEOMETRY
-     if [ "$CONFIG_MTD_CFI_GEOMETRY" = "y" ]; then
-       bool '    Support  8-bit buswidth' CONFIG_MTD_CFI_B1
-       bool '    Support 16-bit buswidth' CONFIG_MTD_CFI_B2
-       bool '    Support 32-bit buswidth' CONFIG_MTD_CFI_B4
-	 if [ "$CONFIG_MTD_CFI_B1" = "y" ]; then
-	   define_bool CONFIG_MTD_CFI_I1 y
-         else
-           bool '    Support 1-chip flash interleave' CONFIG_MTD_CFI_I1
-	 fi
-       bool '    Support 2-chip flash interleave' CONFIG_MTD_CFI_I2
-       bool '    Support 4-chip flash interleave' CONFIG_MTD_CFI_I4
+   if [ "$CONFIG_MTD_GEN_PROBE" = "y" -o "$CONFIG_MTD_GEN_PROBE" = "m" ]; then
+      bool '  Flash chip driver advanced configuration options' CONFIG_MTD_CFI_ADV_OPTIONS
+      if [ "$CONFIG_MTD_CFI_ADV_OPTIONS" = "y" ]; then
+        choice 'Flash cmd/query data swapping'			\
+   	"NO			CONFIG_MTD_CFI_NOSWAP		\
+   	 BIG_ENDIAN_BYTE	CONFIG_MTD_CFI_BE_BYTE_SWAP	\
+   	 LITTLE_ENDIAN_BYTE	CONFIG_MTD_CFI_LE_BYTE_SWAP"	NO
+        bool '  Specific CFI Flash geometry selection' CONFIG_MTD_CFI_GEOMETRY
+        if [ "$CONFIG_MTD_CFI_GEOMETRY" = "y" ]; then
+          bool '    Support  8-bit buswidth' CONFIG_MTD_CFI_B1
+          bool '    Support 16-bit buswidth' CONFIG_MTD_CFI_B2
+          bool '    Support 32-bit buswidth' CONFIG_MTD_CFI_B4
+   	 if [ "$CONFIG_MTD_CFI_B1" = "y" ]; then
+   	   define_bool CONFIG_MTD_CFI_I1 y
+   	 else
+   	   bool '    Support 1-chip flash interleave' CONFIG_MTD_CFI_I1
+   	 fi
+          bool '    Support 2-chip flash interleave' CONFIG_MTD_CFI_I2
+          bool '    Support 4-chip flash interleave' CONFIG_MTD_CFI_I4
+        fi
      fi
-  fi
-fi
-dep_tristate '  Support for Intel/Sharp flash chips' CONFIG_MTD_CFI_INTELEXT $CONFIG_MTD_GEN_PROBE
-dep_tristate '  Support for AMD/Fujitsu flash chips' CONFIG_MTD_CFI_AMDSTD $CONFIG_MTD_GEN_PROBE
-
-dep_tristate '  Support for RAM chips in bus mapping' CONFIG_MTD_RAM $CONFIG_MTD
-dep_tristate '  Support for ROM chips in bus mapping' CONFIG_MTD_ROM $CONFIG_MTD
-dep_tristate '  Support for absent chips in bus mapping' CONFIG_MTD_ABSENT $CONFIG_MTD
-
-bool '  Older (theoretically obsoleted now) drivers for non-CFI chips' CONFIG_MTD_OBSOLETE_CHIPS
-dep_tristate '  AMD compatible flash chip support (non-CFI)' CONFIG_MTD_AMDSTD $CONFIG_MTD $CONFIG_MTD_OBSOLETE_CHIPS
-dep_tristate '  pre-CFI Sharp chip support' CONFIG_MTD_SHARP $CONFIG_MTD $CONFIG_MTD_OBSOLETE_CHIPS
-dep_tristate '  JEDEC device support' CONFIG_MTD_JEDEC $CONFIG_MTD $CONFIG_MTD_OBSOLETE_CHIPS
+   fi
+   dep_tristate '  Support for Intel/Sharp flash chips' CONFIG_MTD_CFI_INTELEXT $CONFIG_MTD_GEN_PROBE
+   dep_tristate '  Support for AMD/Fujitsu flash chips' CONFIG_MTD_CFI_AMDSTD $CONFIG_MTD_GEN_PROBE
 
+   dep_tristate '  Support for RAM chips in bus mapping' CONFIG_MTD_RAM $CONFIG_MTD
+   dep_tristate '  Support for ROM chips in bus mapping' CONFIG_MTD_ROM $CONFIG_MTD
+   dep_tristate '  Support for absent chips in bus mapping' CONFIG_MTD_ABSENT $CONFIG_MTD
+
+   bool '  Older (theoretically obsoleted now) drivers for non-CFI chips' CONFIG_MTD_OBSOLETE_CHIPS
+   dep_tristate '  AMD compatible flash chip support (non-CFI)' CONFIG_MTD_AMDSTD $CONFIG_MTD $CONFIG_MTD_OBSOLETE_CHIPS
+   dep_tristate '  pre-CFI Sharp chip support' CONFIG_MTD_SHARP $CONFIG_MTD $CONFIG_MTD_OBSOLETE_CHIPS
+   dep_tristate '  JEDEC device support' CONFIG_MTD_JEDEC $CONFIG_MTD $CONFIG_MTD_OBSOLETE_CHIPS
+fi
 
 endmenu
diff --exclude '*.swp' --exclude '*.orig' --exclude '*~' -Nur linux-2.4.19/drivers/mtd/devices/Config.in linux-2.4.19-memory_bus/drivers/mtd/devices/Config.in
--- linux-2.4.19/drivers/mtd/devices/Config.in	2001-10-04 18:13:18.000000000 -0400
+++ linux-2.4.19-memory_bus/drivers/mtd/devices/Config.in	2002-11-06 13:27:39.000000000 -0500
@@ -10,7 +10,7 @@
    bool '    PMC551 256M DRAM Bugfix' CONFIG_MTD_PMC551_BUGFIX
    bool '    PMC551 Debugging' CONFIG_MTD_PMC551_DEBUG
 fi
-dep_tristate '  Uncached system RAM' CONFIG_MTD_SLRAM $CONFIG_MTD
+dep_tristate '  Uncached system RAM' CONFIG_MTD_SLRAM $CONFIG_MTD "$CONFIG_MEMORY_BUS"
 if [ "$CONFIG_SA1100_LART" = "y" ]; then
   dep_tristate '  28F160xx flash driver for LART' CONFIG_MTD_LART $CONFIG_MTD
 fi
@@ -24,7 +24,8 @@
 fi
 dep_tristate '  MTD emulation using block device' CONFIG_MTD_BLKMTD $CONFIG_MTD
 
-comment 'Disk-On-Chip Device Drivers'
+if [ "$CONFIG_MEMORY_BUS" = "y" ]; then
+   comment 'Disk-On-Chip Device Drivers'
    dep_tristate '  M-Systems Disk-On-Chip 1000' CONFIG_MTD_DOC1000 $CONFIG_MTD
    dep_tristate '  M-Systems Disk-On-Chip 2000 and Millennium' CONFIG_MTD_DOC2000 $CONFIG_MTD
    dep_tristate '  M-Systems Disk-On-Chip Millennium-only alternative driver (see help)' CONFIG_MTD_DOC2001 $CONFIG_MTD
@@ -50,6 +51,7 @@
          bool '    Probe for 0x55 0xAA BIOS Extension Signature' CONFIG_MTD_DOCPROBE_55AA
       fi
    fi
+fi
 
 
 endmenu
diff --exclude '*.swp' --exclude '*.orig' --exclude '*~' -Nur linux-2.4.19/drivers/mtd/nand/Config.in linux-2.4.19-memory_bus/drivers/mtd/nand/Config.in
--- linux-2.4.19/drivers/mtd/nand/Config.in	2001-10-04 18:13:18.000000000 -0400
+++ linux-2.4.19-memory_bus/drivers/mtd/nand/Config.in	2002-11-06 13:27:40.000000000 -0500
@@ -6,7 +6,7 @@
 
 comment 'NAND Flash Device Drivers'
 
-dep_tristate '  NAND Device Support' CONFIG_MTD_NAND $CONFIG_MTD
+dep_tristate '  NAND Device Support' CONFIG_MTD_NAND $CONFIG_MTD "$CONFIG_MEMORY_BUS"
 if [ "$CONFIG_MTD_NAND" = "y" -o "$CONFIG_MTD_NAND" = "m" ]; then
    bool '    Enable ECC correction algorithm'  CONFIG_MTD_NAND_ECC
    bool '    Verify NAND page writes' CONFIG_MTD_NAND_VERIFY_WRITE