From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 20 Sep 2012 06:37:33 +0000 (+1000)
Subject: Merge remote-tracking branch 'tegra/for-next'
X-Git-Tag: next-20120920~8
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=26584a931c3cd0e701fc12cb4e9652c2534e0f8e;p=karo-tx-linux.git

Merge remote-tracking branch 'tegra/for-next'

Conflicts:
	arch/arm/mach-tegra/devices.c
---

26584a931c3cd0e701fc12cb4e9652c2534e0f8e
diff --cc arch/arm/configs/tegra_defconfig
index adcf3c282e2d,0d6bb738c6de..e2184f6c20b3
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@@ -162,19 -142,11 +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
diff --cc drivers/spi/Kconfig
index 76631d0b1cae,2d198a01a410..323ea8f5724c
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@@ -378,16 -364,9 +378,16 @@@ config SPI_STMP3XX
  	help
  	  SPI driver for Freescale STMP37xx/378x SoC SSP interface
  
 +config SPI_MXS
 +	tristate "Freescale MXS SPI controller"
 +	depends on ARCH_MXS
 +	select STMP_DEVICE
 +	help
 +	  SPI driver for Freescale MXS devices.
 +
  config SPI_TEGRA
  	tristate "Nvidia Tegra SPI controller"
- 	depends on ARCH_TEGRA && (TEGRA_SYSTEM_DMA || TEGRA20_APB_DMA)
+ 	depends on ARCH_TEGRA && TEGRA20_APB_DMA
  	help
  	  SPI driver for NVidia Tegra SoCs