Skip to content

Commit

Permalink
Merge branch 'fixallnoconfig' of git://git.kernel.org/pub/scm/linux/k…
Browse files Browse the repository at this point in the history 
…ernel/git/aegl/linux-2.6

* 'fixallnoconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] fix "allnoconfig" build
  • Loading branch information
Linus Torvalds committed Aug 16, 2011
2 parents 4fec0e0 + 88ff987 commit 4bc9b07
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 1 deletion.
1 change: 0 additions & 1 deletion arch/ia64/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions arch/ia64/configs/generic_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 4bc9b07

Please sign in to comment.