X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fgeneric%2Fconfig-3.6;h=6ce43330a2e6fc59bc795e2e3cdff70625bfaf9b;hb=a5d06f9a87722552ec902c8895683aac059ac477;hp=54dda4a57f1398e104d305b96d09700d475f5135;hpb=288f6b0a2445a33e696a15fe05a97f062a4209be;p=openwrt.git

diff --git a/target/linux/generic/config-3.6 b/target/linux/generic/config-3.6
index 54dda4a57f..6ce43330a2 100644
--- a/target/linux/generic/config-3.6
+++ b/target/linux/generic/config-3.6
@@ -120,6 +120,7 @@ CONFIG_ARPD=y
 # CONFIG_ASYNC_TX_DMA is not set
 # CONFIG_AT76C50X_USB is not set
 # CONFIG_ATA is not set
+CONFIG_ATAGS_PROC=y
 # CONFIG_ATALK is not set
 # CONFIG_ATARI_PARTITION is not set
 # CONFIG_ATA_ACPI is not set
@@ -249,6 +250,7 @@ CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_IDEPCI is not set
 # CONFIG_BLK_DEV_IDEPNP is not set
 # CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDE_AU1XXX is not set
 # CONFIG_BLK_DEV_IDE_SATA is not set
 CONFIG_BLK_DEV_INITRD=y
 # CONFIG_BLK_DEV_INTEGRITY is not set
@@ -416,7 +418,7 @@ CONFIG_CIFS_STATS=y
 # CONFIG_CIFS_XATTR is not set
 # CONFIG_CLEANCACHE is not set
 CONFIG_CLS_U32_MARK=y
-CONFIG_CLS_U32_PERF=y
+# CONFIG_CLS_U32_PERF is not set
 # CONFIG_CMA is not set
 CONFIG_CMDLINE=""
 # CONFIG_CMDLINE_BOOL is not set
@@ -821,6 +823,7 @@ CONFIG_FUTEX=y
 CONFIG_FW_LOADER=y
 CONFIG_GACT_PROB=y
 # CONFIG_GAMEPORT is not set
+# CONFIG_GCOV is not set
 # CONFIG_GCOV_KERNEL is not set
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 # CONFIG_GENERIC_CPU_DEVICES is not set
@@ -1163,6 +1166,7 @@ CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_WISTRON_BTNS is not set
 # CONFIG_INPUT_YEALINK is not set
 # CONFIG_INTEL_IDLE is not set
+# CONFIG_INTEL_MEI is not set
 # CONFIG_INTEL_MID_PTI is not set
 # CONFIG_INTEL_OAKTRAIL is not set
 # CONFIG_IOMMU_SUPPORT is not set
@@ -1565,6 +1569,7 @@ CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_MLX4_EN is not set
 # CONFIG_MMC is not set
 # CONFIG_MMC_ARMMMCI is not set
+# CONFIG_MMC_AU1X is not set
 # CONFIG_MMC_BLOCK is not set
 CONFIG_MMC_BLOCK_BOUNCE=y
 CONFIG_MMC_BLOCK_MINORS=8
@@ -2306,6 +2311,7 @@ CONFIG_PROC_SYSCTL=y
 # CONFIG_PROVE_RCU is not set
 # CONFIG_PSB6970_PHY is not set
 # CONFIG_PSTORE is not set
+# CONFIG_PTP_1588_CLOCK_IXP46X is not set
 # CONFIG_QLA3XXX is not set
 # CONFIG_QLCNIC is not set
 # CONFIG_QLGE is not set
@@ -2351,7 +2357,7 @@ CONFIG_RCU_FANOUT_LEAF=16
 # CONFIG_RDS is not set
 # CONFIG_RD_BZIP2 is not set
 # CONFIG_RD_GZIP is not set
-CONFIG_RD_LZMA=y
+# CONFIG_RD_LZMA is not set
 # CONFIG_RD_LZO is not set
 # CONFIG_RD_XZ is not set
 # CONFIG_READABLE_ASM is not set
@@ -2699,14 +2705,17 @@ CONFIG_SERIAL_8250=y
 # CONFIG_SERIAL_8250_BOCA is not set
 CONFIG_SERIAL_8250_CONSOLE=y
 # CONFIG_SERIAL_8250_CS is not set
+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
 # CONFIG_SERIAL_8250_DW is not set
 # CONFIG_SERIAL_8250_EM is not set
 # CONFIG_SERIAL_8250_EXAR_ST16C554 is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set
 # CONFIG_SERIAL_8250_FOURPORT is not set
 # CONFIG_SERIAL_8250_HUB6 is not set
+# CONFIG_SERIAL_8250_MANY_PORTS is not set
 CONFIG_SERIAL_8250_NR_UARTS=2
 # CONFIG_SERIAL_8250_PCI is not set
+# CONFIG_SERIAL_8250_RSA is not set
 CONFIG_SERIAL_8250_RUNTIME_UARTS=2
 # CONFIG_SERIAL_ALTERA_JTAGUART is not set
 # CONFIG_SERIAL_ALTERA_UART is not set
@@ -2900,6 +2909,8 @@ CONFIG_SND_PCM_OSS_PLUGINS=y
 # CONFIG_SND_SIMPLE_CARD is not set
 # CONFIG_SND_SIS7019 is not set
 # CONFIG_SND_SOC is not set
+# CONFIG_SND_SOC_AU1XAUDIO is not set
+# CONFIG_SND_SOC_AU1XPSC is not set
 # CONFIG_SND_SOC_CACHE_LZO is not set
 # CONFIG_SND_SOC_MPC5200_AC97 is not set
 # CONFIG_SND_SOC_MPC5200_I2S is not set
@@ -2944,6 +2955,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SPI is not set
 # CONFIG_SPINLOCK_TEST is not set
 # CONFIG_SPI_ALTERA is not set
+# CONFIG_SPI_AU1550 is not set
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_BUTTERFLY is not set
 # CONFIG_SPI_DEBUG is not set
@@ -3628,9 +3640,9 @@ CONFIG_XZ_DEC=y
 # CONFIG_ZD1211RW is not set
 # CONFIG_ZD1211RW_DEBUG is not set
 # CONFIG_ZEROPLUS_FF is not set
-CONFIG_ZISOFS=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_ZLIB_INFLATE=y
+# CONFIG_ZISOFS is not set
+# CONFIG_ZLIB_DEFLATE is not set
+# CONFIG_ZLIB_INFLATE is not set
 # CONFIG_ZNET is not set
 CONFIG_ZONE_DMA=y
 CONFIG_ZONE_DMA_FLAG=1