summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config-generic159
-rw-r--r--kernel.spec3
-rw-r--r--mod-extra.list23
3 files changed, 29 insertions, 156 deletions
diff --git a/config-generic b/config-generic
index ed76596e5..edbbac057 100644
--- a/config-generic
+++ b/config-generic
@@ -194,128 +194,31 @@ CONFIG_EXTRA_FIRMWARE=""
#
# Memory Technology Devices (MTD)
#
-CONFIG_MTD=m
-# CONFIG_MTD_DEBUG is not set
-CONFIG_MTD_SWAP=m
-CONFIG_MTD_AR7_PARTS=m
-CONFIG_MTD_CMDLINE_PARTS=y
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_CHAR=m
-CONFIG_MTD_BLOCK=m
-CONFIG_MTD_BLOCK_RO=m
-CONFIG_MTD_BLOCK2MTD=m
-
-CONFIG_MTD_OOPS=m
-# CONFIG_MTD_INTEL_VR_NOR is not set
-CONFIG_MTD_ALAUDA=m
-CONFIG_MTD_DOCG3=m
-
-CONFIG_FTL=m
-CONFIG_NFTL=m
-CONFIG_NFTL_RW=y
-CONFIG_INFTL=m
-CONFIG_RFD_FTL=m
-CONFIG_SSFDC=m
-# CONFIG_SM_FTL is not set
-
-CONFIG_MTD_UBI=m
-CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_RESERVE=1
-# CONFIG_MTD_UBI_GLUEBI is not set
-# CONFIG_MTD_UBI_DEBUG is not set
-
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_CFI=m
-CONFIG_MTD_JEDECPROBE=m
-CONFIG_MTD_GEN_PROBE=m
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_CFI_INTELEXT=m
-CONFIG_MTD_CFI_AMDSTD=m
-CONFIG_MTD_CFI_STAA=m
-CONFIG_MTD_RAM=m
-CONFIG_MTD_ROM=m
-CONFIG_MTD_ABSENT=m
-
-#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-# CONFIG_MTD_PHYSMAP is not set
-# CONFIG_MTD_LATCH_ADDR is not set
-CONFIG_MTD_SC520CDP=m
-CONFIG_MTD_NETSC520=m
-# CONFIG_MTD_SBC_GXX is not set
-# CONFIG_MTD_SCx200_DOCFLASH is not set
-# CONFIG_MTD_AMD76XROM is not set
-CONFIG_MTD_SCB2_FLASH=m
-# CONFIG_MTD_NETtel is not set
-# CONFIG_MTD_DILNETPC is not set
-# CONFIG_MTD_L440GX is not set
-CONFIG_MTD_PCI=m
-CONFIG_MTD_TS5500=m
-# CONFIG_MTD_GPIO_ADDR is not set
-# CONFIG_MTD_PCMCIA is not set
-
-#
-# Self-contained MTD device drivers
-#
-CONFIG_MTD_PMC551=m
-# CONFIG_MTD_PMC551_BUGFIX is not set
-# CONFIG_MTD_PMC551_DEBUG is not set
-# CONFIG_MTD_SLRAM is not set
-CONFIG_MTD_MTDRAM=m
-CONFIG_MTDRAM_TOTAL_SIZE=4096
-CONFIG_MTDRAM_ERASE_SIZE=128
-
-#
-# Disk-On-Chip Device Drivers
-#
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-# CONFIG_MTD_DOCPROBE is not set
-# CONFIG_MTD_DOCPROBE_ADVANCED is not set
-# CONFIG_MTD_DOCPROBE_ADDRESS is not set
-
-#
-# NAND Flash Device Drivers
-#
-CONFIG_MTD_NAND=m
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-# CONFIG_MTD_NAND_PLATFORM is not set
+# CONFIG_MTD is not set
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_SWAP is not set
+# CONFIG_MTD_CFI is not set
+# CONFIG_MTD_JEDECPROBE is not set
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+# CONFIG_MTD_DOCG3 is not set
# CONFIG_MTD_NAND_VERIFY_WRITE is not set
# CONFIG_MTD_NAND_ECC_BCH is not set
-# CONFIG_MTD_NAND_CAFE is not set
-CONFIG_MTD_NAND_IDS=m
-CONFIG_MTD_NAND_NANDSIM=m
-# CONFIG_MTD_ONENAND is not set
-CONFIG_MTD_NAND_ECC_SMC=y
-CONFIG_MTD_NAND_CS553X=m
-# CONFIG_MTD_NAND_DENALI is not set
-CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xFF108018
-# CONFIG_MTD_NAND_GPIO is not set
-CONFIG_MTD_NAND_RICOH=m
-
-CONFIG_MTD_REDBOOT_PARTS=m
-# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
-# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
-CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
-# CONFIG_MTD_XIP is not set
-# CONFIG_MTD_ICHXROM is not set
-# CONFIG_MTD_PHRAM is not set
-CONFIG_MTD_NAND_DISKONCHIP=m
-# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
-# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
-# CONFIG_MTD_PLATRAM is not set
-
-# CONFIG_MTD_TESTS is not set
-CONFIG_MTD_LPDDR=m
-CONFIG_MTD_QINFO_PROBE=m
+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
+# CONFIG_MTD_NAND_DISKONCHIP is not set
+# CONFIG_MTD_LPDDR is not set
+# CONFIG_MTD_UBI is not set
+
#
# Parallel port support
@@ -3680,15 +3583,8 @@ CONFIG_BEFS_FS=m
# CONFIG_BEFS_DEBUG is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
-CONFIG_JFFS2_FS=m
-CONFIG_JFFS2_FS_DEBUG=0
-# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-CONFIG_JFFS2_SUMMARY=y
-CONFIG_JFFS2_FS_XATTR=y
-CONFIG_JFFS2_FS_POSIX_ACL=y
-CONFIG_JFFS2_FS_SECURITY=y
+# CONFIG_JFFS2_FS is not set
+
CONFIG_CRAMFS=m
CONFIG_SQUASHFS=m
CONFIG_SQUASHFS_XATTR=y
@@ -3778,10 +3674,7 @@ CONFIG_DLM_DEBUG=y
CONFIG_GFS2_FS=m
CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_UBIFS_FS=m
-CONFIG_UBIFS_FS_XATTR=y
-# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
-# CONFIG_UBIFS_FS_DEBUG is not set
+# CONFIG_UBIFS_FS is not set
#
# Partition Types
diff --git a/kernel.spec b/kernel.spec
index 2140bd240..21183c4ef 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2318,6 +2318,9 @@ fi
# || ||
%changelog
* Fri Jan 13 2012 Dave Jones <davej@redhat.com>
+- Disable MTD
+
+* Fri Jan 13 2012 Dave Jones <davej@redhat.com>
- Flannel shirts, Grunge music, IOMega ZIP drives, PCMCIA & ISA SCSI
controllers. The 90s were _awesome_. But it's time to move on.
diff --git a/mod-extra.list b/mod-extra.list
index 1fa64ef67..b670e836c 100644
--- a/mod-extra.list
+++ b/mod-extra.list
@@ -36,7 +36,6 @@ ipx.ko
appletalk.ko
ipddp.ko
wanrouter.ko
-phonet.ko
pn_pep.ko
af_802154.ko
ieee802154.ko
@@ -70,10 +69,6 @@ bpqether.ko
hdlcdrv.ko
mkiss.ko
yam.ko
-can.ko
-can-raw.ko
-can-bcm.ko
-can-dev.ko
slcan.ko
vcan.ko
c_can.ko
@@ -90,22 +85,6 @@ esd_usb2.ko
wimax.ko
nfc.ko
nci.ko
-mtd.ko
-chipreg.ko
-cfi_util.ko
-gen_probe.ko
-map_funcs.ko
-nand_ecc.ko
-nand_ids.ko
-r852.ko
-mtdblock.ko
-mtdblock_ro.ko
-ftl.ko
-nftl.ko
-rfd_ftl.ko
-inftl.ko
-ssfdc.ko
-mtdswap.ko
mptbase.ko
mptctl.ko
mptfc.ko
@@ -172,8 +151,6 @@ ocfs2_dlm.ko
cuse.ko
affs.ko
befs.ko
-jffs2.ko
-ubifs.ko
sysv.ko
ufs.ko
ncpfs.ko