summaryrefslogtreecommitdiff
path: root/drivers/spi
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2012-05-14 18:22:46 +0900
committerKukjin Kim <kgene.kim@samsung.com>2012-05-14 18:22:46 +0900
commitf1cb86ece24fbdf99d0cd544a2f0076f2d01eaa5 (patch)
tree1746550efeb3faaab847fe561fd2e1ece89af688 /drivers/spi
parenta024fa1313d57264ad88a7a4f2f96f9472986712 (diff)
parentc4bec603831d2f792a73c2422118f07000c15d5d (diff)
downloadlinux-3.10-f1cb86ece24fbdf99d0cd544a2f0076f2d01eaa5.tar.gz
linux-3.10-f1cb86ece24fbdf99d0cd544a2f0076f2d01eaa5.tar.bz2
linux-3.10-f1cb86ece24fbdf99d0cd544a2f0076f2d01eaa5.zip
Merge branch 'next/devel-s3c24xx-hsspi' into next/devel-samsung
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 00c024039c9..cd2fe350e72 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -311,7 +311,7 @@ config SPI_S3C24XX_FIQ
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.