diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 15:17:34 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 15:17:34 +0200 |
| commit | a32750c2ca6f697903b19063fc86f4272865e3a1 (patch) | |
| tree | 57a23806c5358855eb426c006c88943afa683b1b /arch/ia64/Kconfig | |
| parent | 318007e9001349db9b4fcd49e9e79a7636dba7a9 (diff) | |
| parent | d870ea1d6bc5057f2599416655b42ab192dae6d0 (diff) | |
| download | talos-op-linux-a32750c2ca6f697903b19063fc86f4272865e3a1.tar.gz talos-op-linux-a32750c2ca6f697903b19063fc86f4272865e3a1.zip | |
Merge branches 'imx/pata' and 'imx/sata' into next/driver
Conflicts:
arch/arm/mach-mx5/clock-mx51-mx53.c
arch/arm/mach-mx5/devices-imx53.h
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 |
