kernel: update 3.14 to 3.14.30

[openwrt.git] / target / linux / pxa / config-3.3

diff --git a/target/linux/pxa/config-3.3 b/target/linux/pxa/config-3.3
index 21771cb..c93782f 100644 (file)
--- a/target/linux/pxa/config-3.3
+++ b/target/linux/pxa/config-3.3
@@ -6,7 +6,6 @@ CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
 # CONFIG_ARCH_LUBBOCK is not set
 CONFIG_ARCH_MTD_XIP=y
 CONFIG_ARCH_NR_GPIO=0
-# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
 CONFIG_ARCH_PXA=y
 # CONFIG_ARCH_PXA_ESERIES is not set
 # CONFIG_ARCH_PXA_IDP is not set
@@ -15,7 +14,6 @@ CONFIG_ARCH_PXA=y
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
-# CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # CONFIG_ARCH_USES_GETTIMEOFFSET is not set
 # CONFIG_ARCH_VIPER is not set
@@ -26,11 +24,7 @@ CONFIG_ARM_NR_BANKS=8
 CONFIG_ARM_PATCH_PHYS_VIRT=y
 # CONFIG_ARM_THUMB is not set
 # CONFIG_ARPD is not set
-CONFIG_ATA=m
-# CONFIG_ATMEL_PWM is not set
 CONFIG_AUTO_ZRELADDR=y
-CONFIG_BCMA_POSSIBLE=y
-CONFIG_BLK_DEV_IDECS=m
 # CONFIG_BLK_DEV_IDEDMA is not set
 # CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CACHE_L2X0 is not set
@@ -51,7 +45,6 @@ CONFIG_CPU_XSCALE=y
 CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_LL_UART_NONE is not set
 # CONFIG_DEBUG_USER is not set
-# CONFIG_DW_WATCHDOG is not set
 CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_EPOLL is not set
 CONFIG_FRAME_POINTER=y
@@ -59,7 +52,6 @@ CONFIG_GENERIC_ATOMIC64=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-# CONFIG_GENERIC_CPU_DEVICES is not set
 CONFIG_GENERIC_GPIO=y
 CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_GENERIC_PCI_IOMAP=y
@@ -96,16 +88,10 @@ CONFIG_HAVE_PROC_CPU=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_SCHED_CLOCK=y
 CONFIG_HAVE_SPARSE_IRQ=y
-CONFIG_I2C=m
 CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_PXA=m
-# CONFIG_I2C_PXA_PCI is not set
 CONFIG_I2C_PXA_SLAVE=y
-CONFIG_IDE=m
 CONFIG_IWMMXT=y
 CONFIG_KTIME_SCALAR=y
-# CONFIG_LEDS_GPIO is not set
 # CONFIG_MACH_ARCOM_ZEUS is not set
 # CONFIG_MACH_ARMCORE is not set
 # CONFIG_MACH_BALLOON3 is not set
@@ -162,14 +148,9 @@ CONFIG_NEED_PER_CPU_KM=y
 # CONFIG_PACKET is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_PATA_PCMCIA=m
 # CONFIG_PATA_PXA is not set
-CONFIG_PCCARD=m
 # CONFIG_PCI_SYSCALL is not set
-CONFIG_PCMCIA=m
 CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_PCMCIA_PXA2XX=m
-CONFIG_PCMCIA_SOC_COMMON=m
 CONFIG_PERF_USE_VMALLOC=y
 CONFIG_PHYLIB=y
 CONFIG_PLAT_PXA=y
@@ -177,22 +158,11 @@ CONFIG_PLAT_PXA=y
 CONFIG_PXA27x=y
 # CONFIG_PXA_EZX is not set
 # CONFIG_PXA_SHARPSL is not set
-# CONFIG_QUOTACTL is not set
-CONFIG_SA1100_WATCHDOG=m
-CONFIG_SCSI=m
-CONFIG_SCSI_MOD=m
 # CONFIG_SCSI_MULTI_LUN is not set
 # CONFIG_SCSI_PROC_FS is not set
-# CONFIG_SDIO_UART is not set
 # CONFIG_SERIAL_8250 is not set
 CONFIG_SERIAL_PXA=y
 CONFIG_SERIAL_PXA_CONSOLE=y
-CONFIG_SERIO=m
-CONFIG_SERIO_LIBPS2=m
-# CONFIG_SERIO_RAW is not set
-CONFIG_SERIO_SERPORT=m
-CONFIG_SMC911X=m
-CONFIG_SMC91X=m
 CONFIG_SMSC911X=y
 # CONFIG_SMSC911X_ARCH_HOOKS is not set
 CONFIG_SPARSE_IRQ=y
@@ -200,11 +170,11 @@ CONFIG_SPLIT_PTLOCK_CPUS=999999
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 # CONFIG_TRIZEPS_PXA is not set
 CONFIG_UID16=y
-CONFIG_UNIX=m
 CONFIG_VECTORS_BASE=0xffff0000
 # CONFIG_VLAN_8021Q is not set
 CONFIG_XSCALE_PMU=y
-CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_BCJ=y
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZONE_DMA_FLAG=0