From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 7 Oct 2012 11:49:16 +0000 (+0900)
Subject: Merge tag 'defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=84424026c0a910886064049d414a12a4f4dd125e;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'defconfig' of git://git./linux/kernel/git/arm/arm-soc

Pull ARM soc defconfig updates from Olof Johansson:
 "This might be the last time we do a standalone defconfig branch, since
  we now prefer to get them with the rest of the subarch updates
  instead.  These add a handful of useful options on various platforms,
  enable new boards and SoCs, etc."

* tag 'defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: tegra: defconfig updates
  ARM: LPC32xx: Defconfig update
  ARM: mach-shmobile: marzen: defconfig update
  ARM: mxs_defconfig: Add SPI and LRADC support
  ARM: s3c6400_defconfig: enable more boards in defconfig
  ARM: imx_v6_v7_defconfig: Remove CONFIG_DEFAULT_MMAP_MIN_ADDR
  ARM: imx_v6_v7_defconfig: Add Chipidea USB driver support
  ARM: mxs_defconfig: Add framebuffer support
  ARM: mxs_defconfig: Add LED, PWM and MTD_CHAR support
  ARM: mxs_defconfig: Enable USB host
---

84424026c0a910886064049d414a12a4f4dd125e
diff --cc arch/arm/configs/marzen_defconfig
index f513acedc10a,737e49890db5..53382b6c8bb4
--- a/arch/arm/configs/marzen_defconfig
+++ b/arch/arm/configs/marzen_defconfig
@@@ -68,11 -71,10 +71,12 @@@ CONFIG_SERIAL_SH_SCI_CONSOLE=
  # CONFIG_HW_RANDOM is not set
  CONFIG_GPIO_SYSFS=y
  # CONFIG_HWMON is not set
 +CONFIG_THERMAL=y
 +CONFIG_RCAR_THERMAL=y
  CONFIG_SSB=y
- # CONFIG_HID_SUPPORT is not set
  # CONFIG_USB_SUPPORT is not set
+ CONFIG_MMC=y
+ CONFIG_MMC_SDHI=y
  CONFIG_UIO=y
  CONFIG_UIO_PDRV_GENIRQ=y
  # CONFIG_IOMMU_SUPPORT is not set
diff --cc arch/arm/configs/tegra_defconfig
index 0d6bb738c6de,adcf3c282e2d..e2184f6c20b3
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@@ -142,11 -162,19 +162,21 @@@ CONFIG_MMC_BLOCK_MINORS=1
  CONFIG_MMC_SDHCI=y
  CONFIG_MMC_SDHCI_PLTFM=y
  CONFIG_MMC_SDHCI_TEGRA=y
+ CONFIG_NEW_LEDS=y
+ CONFIG_LEDS_CLASS=y
+ CONFIG_LEDS_GPIO=y
+ CONFIG_LEDS_TRIGGERS=y
+ CONFIG_LEDS_TRIGGER_GPIO=y
  CONFIG_RTC_CLASS=y
+ CONFIG_RTC_INTF_SYSFS=y
+ CONFIG_RTC_INTF_PROC=y
+ CONFIG_RTC_INTF_DEV=y
+ CONFIG_RTC_DRV_MAX8907=y
+ CONFIG_RTC_DRV_TPS65910=y
  CONFIG_RTC_DRV_EM3027=y
  CONFIG_RTC_DRV_TEGRA=y
 +CONFIG_DMADEVICES=y
 +CONFIG_TEGRA20_APB_DMA=y
  CONFIG_STAGING=y
  CONFIG_SENSORS_ISL29018=y
  CONFIG_SENSORS_ISL29028=y