diff options
| author | Thierry Reding <treding@nvidia.com> | 2014-12-04 16:15:56 +0100 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2014-12-04 16:15:56 +0100 |
| commit | f538c50930b7d4fe3991909f6d411994ba6f605c (patch) | |
| tree | 4d818b6d61af15bffc6c60316c7b5d64efb01bde /arch/arm/Kconfig | |
| parent | 0df1f2487d2f0d04703f142813d53615d62a1da4 (diff) | |
| parent | 8918465163171322c77a19d5258a95f56d89d2e4 (diff) | |
| download | talos-op-linux-f538c50930b7d4fe3991909f6d411994ba6f605c.tar.gz talos-op-linux-f538c50930b7d4fe3991909f6d411994ba6f605c.zip | |
Merge branch 'for-3.19/iommu' into for-3.19/dt
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 89c4b5ccc68d..77f8ca5cc3e6 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1259,9 +1259,6 @@ source "arch/arm/common/Kconfig" menu "Bus support" -config ARM_AMBA - bool - config ISA bool help |
