diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-16 10:40:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-16 10:40:29 -0700 |
| commit | 4bc9b0796b5abe6dffa16faaa7f6b9b25dd4b251 (patch) | |
| tree | 2e2218ca2665a1f1c5c9f78b85aa93de307305b0 | |
| parent | 4fec0e0bde09095b6349dc6206dbf19cebcd0a7e (diff) | |
| parent | 88ff98775885d72618cbfc5ed6b865593cb66891 (diff) | |
| download | linux-4bc9b0796b5abe6dffa16faaa7f6b9b25dd4b251.tar.gz | |
Merge branch 'fixallnoconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'fixallnoconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] fix "allnoconfig" build
| -rw-r--r-- | arch/ia64/Kconfig | 1 | ||||
| -rw-r--r-- | arch/ia64/configs/generic_defconfig | 1 |
2 files changed, 1 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 diff --git a/arch/ia64/configs/generic_defconfig b/arch/ia64/configs/generic_defconfig index 1d7bca0a396d..0e5cd1405e0e 100644 --- a/arch/ia64/configs/generic_defconfig +++ b/arch/ia64/configs/generic_defconfig @@ -234,3 +234,4 @@ CONFIG_CRYPTO_MD5=y # CONFIG_CRYPTO_ANSI_CPRNG is not set CONFIG_CRC_T10DIF=y CONFIG_MISC_DEVICES=y +CONFIG_DMAR=y |