Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/ia64/Kconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -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

arch/ia64/configs/generic_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -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