diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2014-02-18 17:34:18 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2014-02-18 17:34:18 +0000 |
| commit | cd796d2b0c6c6e3a9c15e05e15c7280eefcb4178 (patch) | |
| tree | f62fca88fe71febf11b6da3d0cc94d41120f3f46 | |
| parent | 39e0aea2ae1d21b117348a7e3a990a6eb5ed7f55 (diff) | |
| download | upstream-cd796d2b0c6c6e3a9c15e05e15c7280eefcb4178.tar.gz upstream-cd796d2b0c6c6e3a9c15e05e15c7280eefcb4178.tar.bz2 upstream-cd796d2b0c6c6e3a9c15e05e15c7280eefcb4178.zip | |
kernel: refresh configs with kconfig.pl
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39627 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/generic/config-3.12 | 1 | ||||
| -rw-r--r-- | target/linux/generic/config-3.13 | 11 | ||||
| -rw-r--r-- | target/linux/sunxi/config-3.12 | 2 |
3 files changed, 6 insertions, 8 deletions
diff --git a/target/linux/generic/config-3.12 b/target/linux/generic/config-3.12 index 78d376a0cf..af0db884e9 100644 --- a/target/linux/generic/config-3.12 +++ b/target/linux/generic/config-3.12 @@ -3863,7 +3863,6 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y # CONFIG_USB_SERIAL_SAFE is not set CONFIG_USB_SERIAL_SAFE_PADDED=y # CONFIG_USB_SERIAL_SIEMENS_MPI is not set -# CONFIG_USB_SERIAL_SIMPLE is not set # CONFIG_USB_SERIAL_SIERRAWIRELESS is not set # CONFIG_USB_SERIAL_SIMPLE is not set # CONFIG_USB_SERIAL_SPCP8X5 is not set diff --git a/target/linux/generic/config-3.13 b/target/linux/generic/config-3.13 index 9a222ffcd9..b656e3b27c 100644 --- a/target/linux/generic/config-3.13 +++ b/target/linux/generic/config-3.13 @@ -552,11 +552,11 @@ CONFIG_CAVIUM_OCTEON_HELPER=y # CONFIG_CHELSIO_T3 is not set # CONFIG_CHELSIO_T4 is not set # CONFIG_CHELSIO_T4VF is not set +# CONFIG_CHROME_PLATFORMS is not set # CONFIG_CHR_DEV_OSST is not set # CONFIG_CHR_DEV_SCH is not set # CONFIG_CHR_DEV_SG is not set # CONFIG_CHR_DEV_ST is not set -# CONFIG_CHROME_PLATFORMS is not set # CONFIG_CICADA_PHY is not set # CONFIG_CIFS is not set # CONFIG_CIFS_DEBUG is not set @@ -601,8 +601,8 @@ CONFIG_CONSTRUCTORS=y # CONFIG_CPU_DCACHE_DISABLE is not set # CONFIG_CPU_FREQ is not set # CONFIG_CPU_IDLE is not set -# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set # CONFIG_CPU_IDLE_GOV_MENU is not set +# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set # CONFIG_CRAMFS is not set CONFIG_CRASHLOG=y # CONFIG_CRASH_DUMP is not set @@ -2619,10 +2619,10 @@ CONFIG_PCI_SYSCALL=y # CONFIG_PHANTOM is not set # CONFIG_PHONE is not set # CONFIG_PHONET is not set -# CONFIG_PHY_EXYNOS_MIPI_VIDEO is not set -# CONFIG_PHY_EXYNOS_DP_VIDEO is not set # CONFIG_PHYLIB is not set # CONFIG_PHYS_ADDR_T_64BIT is not set +# CONFIG_PHY_EXYNOS_DP_VIDEO is not set +# CONFIG_PHY_EXYNOS_MIPI_VIDEO is not set # CONFIG_PID_IN_CONTEXTIDR is not set # CONFIG_PID_NS is not set CONFIG_PINCONF=y @@ -3466,9 +3466,9 @@ CONFIG_SND_VERBOSE_PROCFS=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_SQUASHFS=y # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set -# CONFIG_SQUASHFS_DECOMP_SINGLE is not set # CONFIG_SQUASHFS_DECOMP_MULTI is not set CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y +# CONFIG_SQUASHFS_DECOMP_SINGLE is not set # CONFIG_SQUASHFS_EMBEDDED is not set # CONFIG_SQUASHFS_FILE_CACHE is not set CONFIG_SQUASHFS_FILE_DIRECT=y @@ -3922,7 +3922,6 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y # CONFIG_USB_SERIAL_SAFE is not set CONFIG_USB_SERIAL_SAFE_PADDED=y # CONFIG_USB_SERIAL_SIEMENS_MPI is not set -# CONFIG_USB_SERIAL_SIMPLE is not set # CONFIG_USB_SERIAL_SIERRAWIRELESS is not set # CONFIG_USB_SERIAL_SIMPLE is not set # CONFIG_USB_SERIAL_SPCP8X5 is not set diff --git a/target/linux/sunxi/config-3.12 b/target/linux/sunxi/config-3.12 index d24d1c2092..2ef8c2af4a 100644 --- a/target/linux/sunxi/config-3.12 +++ b/target/linux/sunxi/config-3.12 @@ -250,8 +250,8 @@ CONFIG_MIGRATION=y CONFIG_MMC=y CONFIG_MMC_BLOCK=y # CONFIG_MMC_BLOCK_BOUNCE is not set -CONFIG_MMC_UNSAFE_RESUME=y CONFIG_MMC_SUNXI=y +CONFIG_MMC_UNSAFE_RESUME=y CONFIG_MODULES_USE_ELF_REL=y # CONFIG_MTD is not set CONFIG_MULTI_IRQ_HANDLER=y |