diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-06-20 17:06:57 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-06-20 17:06:57 +0400 |
| commit | a0639948b6fb28ebf2063b58ae6e0f4de693f6c3 (patch) | |
| tree | 7ffe6f1caa94a70d56197dad151b556b36fba681 /arch/arm/Kconfig | |
| parent | 688c240b0bd920421fd3b9377b6ba3b731961755 (diff) | |
| parent | 7bb5d75ce91ca3725256c0d502624ed697231cde (diff) | |
| download | linux-a0639948b6fb28ebf2063b58ae6e0f4de693f6c3.tar.xz | |
Merge tag 'davinci-for-v3.11/soc-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc
From Sekhar Nori:
DaVinci SoC changes for v3.11
This pull request moves DaVinci EDMA library to
arch/arm/common so it can be used by OMAP based AM335x.
This is a temporary step until all drivers are converted
to use the dmaengine driver in drivers/dma/edma.c.
Several drivers like SPI, MMC/SD have already been converted.
Some like audio are pending.
The other two patches in the pull request are cleanup in nature.
* tag 'davinci-for-v3.11/soc-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: edma: remove unused transfer controller handlers
ARM: davinci: move private EDMA API to arm/common
ARM: davinci: remove __init atrribute from function declaration
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 23f6aeeaed92..102bf5798501 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -825,6 +825,7 @@ config ARCH_DAVINCI select GENERIC_IRQ_CHIP select HAVE_IDE select NEED_MACH_GPIO_H + select TI_PRIV_EDMA select USE_OF select ZONE_DMA help |