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

Commit 3b31fe92 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'please-pull-ia64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux 

Pull config cleanup for ia64 from Tony Luck:
 "Clean out references to dead CONFIG_MISC_DEVICES option"

* tag 'please-pull-ia64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  [IA64] defconfig: Remove CONFIG_MISC_DEVICES
parents 10c63c9a 7c3ea485

arch/ia64/configs/generic_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -234,5 +234,4 @@ CONFIG_CRYPTO_PCBC=m 
CONFIG_CRYPTO_MD5=y

# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_CRC_T10DIF=y

CONFIG_MISC_DEVICES=y

CONFIG_INTEL_IOMMU=y

arch/ia64/configs/gensparse_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -209,4 +209,3 @@ CONFIG_MAGIC_SYSRQ=y 
CONFIG_DEBUG_KERNEL=y

CONFIG_DEBUG_MUTEXES=y

CONFIG_CRYPTO_MD5=y
 
CONFIG_MISC_DEVICES=y