Merge branch 'pl022' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux...

diff --combined drivers/spi/Kconfig
index 6eeb8a286a2076d3d5c7b5c24093286828afafb8,cd2fe350e724a1db540dc372ca081646bb10a881..0a7256924cf31375ec9ad76d8f7bb27af362843e
--- 1/drivers/spi/Kconfig
--- 2/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@@ -311,7 -311,7 +311,7 @@@ config SPI_S3C24XX_FI
  
  config SPI_S3C64XX
        tristate "Samsung S3C64XX series type SPI"
-       depends on (ARCH_S3C64XX || ARCH_S5P64X0 || ARCH_EXYNOS)
+       depends on (ARCH_S3C24XX || ARCH_S3C64XX || ARCH_S5P64X0 || ARCH_EXYNOS)
        select S3C64XX_DMA if ARCH_S3C64XX
        help
          SPI driver for Samsung S3C64XX and newer SoCs.
@@@ -357,7 -357,7 +357,7 @@@ config SPI_STMP3XX
  
  config SPI_TEGRA
        tristate "Nvidia Tegra SPI controller"
 -      depends on ARCH_TEGRA && TEGRA_SYSTEM_DMA
 +      depends on ARCH_TEGRA && (TEGRA_SYSTEM_DMA || TEGRA20_APB_DMA)
        help
          SPI driver for NVidia Tegra SoCs