sunxi: backport late clock fixes from 3.15

[openwrt/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 c6103b2dc77f410fc835875b9c2d64c836129eb2..40857399c10a1ebf621a86c101831b14a856d21a 100644 (file)
--- a/target/linux/pxa/config-3.3
+++ b/target/linux/pxa/config-3.3
@@ -25,9 +25,7 @@ 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
@@ -49,7 +47,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
@@ -196,7 +193,8 @@ 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