diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-09-10 22:58:42 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-09-10 22:58:42 +0200 |
commit | 72787aa866bfa6bcbd259e7a39b2f9a2f412794e (patch) | |
tree | 1769d854a26f444875f7cdfd9982fe494a4cff71 /arch/ia64/Kconfig | |
parent | ad9f6677575e80ce23cb491d5ffb7b536772552e (diff) | |
parent | 0a072a247fa79979dd31813decb6b118d7d511fd (diff) | |
download | talos-op-linux-72787aa866bfa6bcbd259e7a39b2f9a2f412794e.tar.gz talos-op-linux-72787aa866bfa6bcbd259e7a39b2f9a2f412794e.zip |
Merge branches 'tegra/board' and 'at91/board' into next/board
Diffstat (limited to 'arch/ia64/Kconfig')
-rw-r--r-- | arch/ia64/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 124854714958..3ff7785b3beb 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -162,7 +162,6 @@ config IA64_GENERIC select ACPI_NUMA select SWIOTLB select PCI_MSI - select DMAR help This selects the system type of your hardware. A "generic" kernel will run on any supported IA-64 system. However, if you configure |