kernel: make sure the new UBIBLOCK symbol does not break builds

[openwrt.git] / target / linux / imx6 / config-3.10

diff --git a/target/linux/imx6/config-3.10 b/target/linux/imx6/config-3.10
index 50ebcd9..d7cb3ff 100644 (file)
--- a/target/linux/imx6/config-3.10
+++ b/target/linux/imx6/config-3.10
@@ -1,3 +1,4 @@
+CONFIG_AHCI_IMX=y
 CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_ARCH_BCM is not set
 CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
@@ -15,7 +16,6 @@ CONFIG_ARCH_MULTI_V7=y
 CONFIG_ARCH_MXC=y
 # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
 CONFIG_ARCH_NR_GPIO=0
-# CONFIG_ARCH_OMAP2PLUS is not set
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
@@ -46,7 +46,9 @@ CONFIG_ARM_PATCH_PHYS_VIRT=y
 CONFIG_ARM_THUMB=y
 # CONFIG_ARM_THUMBEE is not set
 CONFIG_ARM_VIRT_EXT=y
+CONFIG_ATA=y
 CONFIG_ATAGS=y
+# CONFIG_ATA_SFF is not set
 CONFIG_AUTO_ZRELADDR=y
 # CONFIG_CACHE_L2X0 is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@ -192,7 +194,7 @@ CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_IMX=y
-# CONFIG_IMX2_WDT is not set
+CONFIG_IMX2_WDT=y
 # CONFIG_IMX_DMA is not set
 # CONFIG_IMX_SDMA is not set
 CONFIG_INITRAMFS_SOURCE=""
@@ -243,7 +245,7 @@ CONFIG_MUTEX_SPIN_ON_OWNER=y
 # CONFIG_MXC_IRQ_PRIOR is not set
 CONFIG_MXS_DMA=y
 CONFIG_NEED_DMA_MAP_STATE=y
-# CONFIG_NET_DMA is not set
+CONFIG_NEON=y
 CONFIG_NLS=y
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NO_HZ_COMMON=y
@@ -304,11 +306,16 @@ CONFIG_REGULATOR_PFUZE100=y
 # CONFIG_RFKILL_REGULATOR is not set
 CONFIG_RFS_ACCEL=y
 CONFIG_RPS=y
+CONFIG_RTC_CLASS=y
+# CONFIG_RTC_DRV_CMOS is not set
+# CONFIG_RTC_DRV_IMXDI is not set
+# CONFIG_RTC_DRV_MXC is not set
 # CONFIG_SAMSUNG_USB2PHY is not set
 # CONFIG_SAMSUNG_USB3PHY is not set
 # CONFIG_SAMSUNG_USBPHY is not set
+CONFIG_SATA_AHCI_PLATFORM=y
 CONFIG_SCHED_HRTICK=y
-# CONFIG_SCSI_DMA is not set
+CONFIG_SCSI=y
 CONFIG_SERIAL_IMX=y
 CONFIG_SERIAL_IMX_CONSOLE=y
 CONFIG_SMP=y
@@ -343,7 +350,8 @@ CONFIG_USB_SUPPORT=y
 CONFIG_USE_GENERIC_SMP_HELPERS=y
 CONFIG_USE_OF=y
 CONFIG_VECTORS_BASE=0xffff0000
-# CONFIG_VFP is not set
+CONFIG_VFP=y
+CONFIG_VFPv3=y
 CONFIG_VMSPLIT_2G=y
 # CONFIG_VMSPLIT_3G is not set
 # CONFIG_XEN is not set
@@ -355,3 +363,4 @@ CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZONE_DMA_FLAG=0
+# CONFIG_MTD_UBI_BLOCK is not set