diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-20 15:26:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-20 15:26:28 -0700 |
| commit | 3b31fe92948439161bc44c11e22e0e474543b5a2 (patch) | |
| tree | 0326b928bd8b101d0df5a31fb62246567a4f391e | |
| parent | 10c63c9aec648402f593b6c883ca247ece7b2af9 (diff) | |
| parent | 7c3ea4859ae132d61594320e148b0348f03c0edc (diff) | |
| download | linux-3.10-3b31fe92948439161bc44c11e22e0e474543b5a2.tar.gz linux-3.10-3b31fe92948439161bc44c11e22e0e474543b5a2.tar.bz2 linux-3.10-3b31fe92948439161bc44c11e22e0e474543b5a2.zip | |
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
| -rw-r--r-- | arch/ia64/configs/generic_defconfig | 1 | ||||
| -rw-r--r-- | arch/ia64/configs/gensparse_defconfig | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/ia64/configs/generic_defconfig b/arch/ia64/configs/generic_defconfig index 954d81e2e83..7913695b2fc 100644 --- a/arch/ia64/configs/generic_defconfig +++ b/arch/ia64/configs/generic_defconfig @@ -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 diff --git a/arch/ia64/configs/gensparse_defconfig b/arch/ia64/configs/gensparse_defconfig index 91c41ecfa6d..f8e91336542 100644 --- a/arch/ia64/configs/gensparse_defconfig +++ b/arch/ia64/configs/gensparse_defconfig @@ -209,4 +209,3 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_MUTEXES=y CONFIG_CRYPTO_MD5=y -CONFIG_MISC_DEVICES=y |