refresh 2.6.25 patches

[openwrt.git] / target / linux / ppc40x / config-default

diff --git a/target/linux/ppc40x/config-default b/target/linux/ppc40x/config-default
index 7ac4e25..51eeebd 100644 (file)
--- a/target/linux/ppc40x/config-default
+++ b/target/linux/ppc40x/config-default
@@ -21,9 +21,8 @@ CONFIG_BASE_SMALL=0
 CONFIG_BITREVERSE=y
 # CONFIG_BOOKE_WDT is not set
 CONFIG_BOUNCE=y
-# CONFIG_BT is not set
 CONFIG_CLASSIC_RCU=y
-CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd init=/etc/preinit"
+CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd"
 CONFIG_CMDLINE_BOOL=y
 CONFIG_CONSISTENT_SIZE=0x00200000
 CONFIG_CONSISTENT_START=0xff100000
@@ -63,6 +62,7 @@ CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_LMB=y
 CONFIG_HAVE_OPROFILE=y
 # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
+# CONFIG_HCU4 is not set
 # CONFIG_HIGHMEM is not set
 CONFIG_HW_RANDOM=y
 CONFIG_HZ=250
@@ -91,7 +91,6 @@ CONFIG_ISA_DMA_API=y
 # CONFIG_IWLWIFI_LEDS is not set
 CONFIG_KERNEL_START=0xc0000000
 CONFIG_KILAUEA=y
-# CONFIG_LEDS_ALIX is not set
 CONFIG_LOWMEM_SIZE=0x30000000
 CONFIG_LZO_COMPRESS=m
 CONFIG_LZO_DECOMPRESS=m
@@ -103,56 +102,11 @@ CONFIG_MAGICBOXV2=y
 # CONFIG_MMIO_NVRAM is not set
 # CONFIG_MPIC is not set
 # CONFIG_MPIC_WEIRD is not set
-CONFIG_MTD=y
-# CONFIG_MTD_ABSENT is not set
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
-# CONFIG_MTD_BLOCK2MTD is not set
-CONFIG_MTD_CFI=y
 CONFIG_MTD_CFI_ADV_OPTIONS=y
-CONFIG_MTD_CFI_AMDSTD=y
-# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
 # CONFIG_MTD_CFI_GEOMETRY is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
 # CONFIG_MTD_CFI_INTELEXT is not set
-# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_NOSWAP=y
-# CONFIG_MTD_CFI_STAA is not set
-CONFIG_MTD_CFI_UTIL=y
-CONFIG_MTD_CHAR=y
-# CONFIG_MTD_CMDLINE_PARTS is not set
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-# CONFIG_MTD_CONCAT is not set
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MTDRAM is not set
 CONFIG_MTD_OF_PARTS=y
-# CONFIG_MTD_ONENAND is not set
-# CONFIG_MTD_OTP is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_PCI is not set
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_PHYSMAP is not set
 CONFIG_MTD_PHYSMAP_OF=y
-# CONFIG_MTD_PLATRAM is not set
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_SLRAM is not set
 # CONFIG_NATSEMI is not set
 # CONFIG_NE2K_PCI is not set
 # CONFIG_NET_VENDOR_3COM is not set
@@ -201,11 +155,9 @@ CONFIG_PPC_UDBG_16550=y
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_R6040 is not set
 CONFIG_RESOURCES_64BIT=y
-CONFIG_RFKILL_LEDS=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 # CONFIG_SCHED_HRTICK is not set
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SERIAL_8250_DETECT_IRQ is not set
 CONFIG_SERIAL_8250_EXTENDED=y
 # CONFIG_SERIAL_8250_MANY_PORTS is not set
@@ -213,20 +165,13 @@ CONFIG_SERIAL_8250_EXTENDED=y
 CONFIG_SERIAL_8250_SHARE_IRQ=y
 CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_SLABINFO=y
-# CONFIG_SOFT_WATCHDOG is not set
+# CONFIG_SND_PPC is not set
 # CONFIG_SOUND is not set
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-CONFIG_SSB_POSSIBLE=y
-CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_TASK_SIZE=0xc0000000
 CONFIG_TICK_ONESHOT=y
 # CONFIG_VGASTATE is not set
 # CONFIG_VIA_RHINE is not set
 CONFIG_VIDEO_MEDIA=m
-CONFIG_VIDEO_V4L1=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEO_V4L2_COMMON=m
 # CONFIG_WALNUT is not set
 CONFIG_WORD_SIZE=32
 # CONFIG_XILINX_SYSACE is not set