Commit 4bc9b079 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 4fec0e0b 88ff9877
...@@ -162,7 +162,6 @@ config IA64_GENERIC ...@@ -162,7 +162,6 @@ config IA64_GENERIC
select ACPI_NUMA select ACPI_NUMA
select SWIOTLB select SWIOTLB
select PCI_MSI select PCI_MSI
select DMAR
help help
This selects the system type of your hardware. A "generic" kernel This selects the system type of your hardware. A "generic" kernel
will run on any supported IA-64 system. However, if you configure will run on any supported IA-64 system. However, if you configure
......
...@@ -234,3 +234,4 @@ CONFIG_CRYPTO_MD5=y ...@@ -234,3 +234,4 @@ CONFIG_CRYPTO_MD5=y
# CONFIG_CRYPTO_ANSI_CPRNG is not set # CONFIG_CRYPTO_ANSI_CPRNG is not set
CONFIG_CRC_T10DIF=y CONFIG_CRC_T10DIF=y
CONFIG_MISC_DEVICES=y CONFIG_MISC_DEVICES=y
CONFIG_DMAR=y
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment