diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-12-04 17:20:02 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-12-04 17:20:02 +0100 |
| commit | e58e501a9b3e0db722263b02d6c06f1656a5dee7 (patch) | |
| tree | ba828148967f084f3301016d7215e0338cec1445 /arch/arm64 | |
| parent | a8afa2645ccf3525409c749c1dc4ec1cf95ff3f5 (diff) | |
| parent | 8918465163171322c77a19d5258a95f56d89d2e4 (diff) | |
| download | talos-op-linux-e58e501a9b3e0db722263b02d6c06f1656a5dee7.tar.gz talos-op-linux-e58e501a9b3e0db722263b02d6c06f1656a5dee7.zip | |
Merge tag 'tegra-for-3.19-iommu' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/drivers
Pull "ARM: tegra: IOMMU support for v3.19" from Thierry Reding:
This adds the driver pieces required for IOMMU support on Tegra30,
Tegra114 and Tegra124.
* tag 'tegra-for-3.19-iommu' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
memory: Add NVIDIA Tegra memory controller support
of: Add NVIDIA Tegra memory controller binding
ARM: tegra: Move AHB Kconfig to drivers/amba
amba: Add Kconfig file
clk: tegra: Implement memory-controller clock
powerpc/iommu: Rename iommu_[un]map_sg functions
iommu: Improve error handling when setting bus iommu
iommu: Do more input validation in iommu_map_sg()
iommu: Add iommu_map_sg() function
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/Kconfig | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 9532f8d5857e..db1aa5446a57 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -166,9 +166,6 @@ endmenu menu "Bus support" -config ARM_AMBA - bool - config PCI bool "PCI support" help |
