diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2014-04-14 13:13:02 +0100 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2014-04-14 13:13:02 +0100 |
| commit | 7b5be104e58ddf140574c831e1da780357b8acf2 (patch) | |
| tree | d978f18c0b6d5439c98517d12e1d76f22716b34d /config-armv7 | |
| parent | 9883f903b2c773b1de94843adeb8691d56e0c4db (diff) | |
| download | kernel-7b5be104e58ddf140574c831e1da780357b8acf2.tar.gz kernel-7b5be104e58ddf140574c831e1da780357b8acf2.tar.xz kernel-7b5be104e58ddf140574c831e1da780357b8acf2.zip | |
Minor ARM config changes and cleanups for 3.15 merge window
Diffstat (limited to 'config-armv7')
| -rw-r--r-- | config-armv7 | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/config-armv7 b/config-armv7 index ba0b2b6e..c51339ab 100644 --- a/config-armv7 +++ b/config-armv7 @@ -1,6 +1,7 @@ # ARM unified arch kernel # CONFIG_ARCH_BERLIN is not set +# CONFIG_MACH_DOVE is not set # CONFIG_ARCH_KEYSTONE is not set CONFIG_ARCH_MVEBU=y CONFIG_ARCH_MXC=y @@ -243,12 +244,13 @@ CONFIG_DISPLAY_PANEL_TPO_TD028TTEC1=m # Enable V4L2 drivers for OMAP2+ CONFIG_MEDIA_CONTROLLER=y -CONFIG_VIDEO_V4L2_SUBDEV_API=y CONFIG_V4L_PLATFORM_DRIVERS=y # CONFIG_VIDEO_OMAP2_VOUT is not set -# CONFIG_VIDEO_OMAP3 is not set -# CONFIG_VIDEO_VPFE_CAPTURE is not set +CONFIG_VIDEO_OMAP3=m +# CONFIG_VIDEO_OMAP4 is not set +# CONFIG_VIDEO_OMAP4_DEBUG is not set # The ones below are for TI Davinci +# CONFIG_VIDEO_VPFE_CAPTURE is not set # CONFIG_VIDEO_VPSS_SYSTEM is not set # CONFIG_VIDEO_DM6446_CCDC is not set # CONFIG_VIDEO_DM644X_VPBE is not set @@ -463,7 +465,6 @@ CONFIG_HW_RANDOM_PICOXCELL=m # ST Ericsson CONFIG_MACH_HREFV60=y CONFIG_MACH_SNOWBALL=y -CONFIG_MACH_UX500_DT=y CONFIG_ABX500_CORE=y CONFIG_ARM_U8500_CPUIDLE=y @@ -478,6 +479,7 @@ CONFIG_KEYBOARD_NOMADIK=m CONFIG_DB8500_CPUFREQ_COOLING=m CONFIG_DB8500_THERMAL=y CONFIG_UX500_WATCHDOG=m +CONFIG_AHCI_ST=m CONFIG_INPUT_AB8500_PONKEY=m CONFIG_REGULATOR_AB8500=y CONFIG_AB8500_USB=m @@ -496,6 +498,7 @@ CONFIG_AB8500_BM=y CONFIG_AB8500_GPADC=y CONFIG_SENSORS_AB8500=m CONFIG_STE_MODEM_RPROC=m +CONFIG_STIH415_RESET=y CONFIG_IIO_ST_GYRO_I2C_3AXIS=m CONFIG_IIO_ST_GYRO_SPI_3AXIS=m @@ -524,6 +527,7 @@ CONFIG_PCI_TEGRA=y CONFIG_TEGRA_IOMMU_GART=y CONFIG_TEGRA_IOMMU_SMMU=y CONFIG_MMC_SDHCI_TEGRA=m +CONFIG_TEGRA_WATCHDOG=m CONFIG_I2C_TEGRA=m CONFIG_I2C_MUX_PCA954x=m @@ -584,8 +588,6 @@ CONFIG_DRM_PANEL_SIMPLE=m CONFIG_DRM_PANEL_LD9040=m CONFIG_DRM_PANEL_S6E8AA0=m -CONFIG_TEGRA_WATCHDOG=m - CONFIG_CRYPTO_DEV_TEGRA_AES=m CONFIG_GPIO_PCA953X=m @@ -609,6 +611,8 @@ CONFIG_I2C_XILINX=m CONFIG_SPI_XILINX=m CONFIG_MMC_SDHCI_OF_ARASAN=m CONFIG_I2C_CADENCE=m +CONFIG_XILINX_WATCHDOG=m +CONFIG_XILINX_XADC=m # Multi function devices CONFIG_MFD_88PM800=m @@ -675,8 +679,6 @@ CONFIG_REGULATOR_MAX8973=m # CONFIG_CRYPTO_DEV_UX500_DEBUG is not set # CONFIG_AB8500_DEBUG is not set -# CONFIG_MACH_DOVE is not set - # CONFIG_SOC_VF610 is not set # CONFIG_MMC_TMIO is not set # CONFIG_SND_SOC_ADI is not set |