浏览代码

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
Linus Torvalds 14 年之前
父节点
当前提交
4bc9b0796b
共有 2 个文件被更改,包括 1 次插入1 次删除
  1. 0 1
      arch/ia64/Kconfig
  2. 1 0
      arch/ia64/configs/generic_defconfig

+ 0 - 1
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

+ 1 - 0
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