diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-20 18:26:28 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-20 18:26:28 -0400 |
| commit | 3b31fe92948439161bc44c11e22e0e474543b5a2 (patch) | |
| tree | 0326b928bd8b101d0df5a31fb62246567a4f391e /arch | |
| parent | 10c63c9aec648402f593b6c883ca247ece7b2af9 (diff) | |
| parent | 7c3ea4859ae132d61594320e148b0348f03c0edc (diff) | |
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
Diffstat (limited to 'arch')
| -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 954d81e2e837..7913695b2fcb 100644 --- a/arch/ia64/configs/generic_defconfig +++ b/arch/ia64/configs/generic_defconfig | |||
| @@ -234,5 +234,4 @@ CONFIG_CRYPTO_PCBC=m | |||
| 234 | CONFIG_CRYPTO_MD5=y | 234 | CONFIG_CRYPTO_MD5=y |
| 235 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 235 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
| 236 | CONFIG_CRC_T10DIF=y | 236 | CONFIG_CRC_T10DIF=y |
| 237 | CONFIG_MISC_DEVICES=y | ||
| 238 | CONFIG_INTEL_IOMMU=y | 237 | CONFIG_INTEL_IOMMU=y |
diff --git a/arch/ia64/configs/gensparse_defconfig b/arch/ia64/configs/gensparse_defconfig index 91c41ecfa6d9..f8e913365423 100644 --- a/arch/ia64/configs/gensparse_defconfig +++ b/arch/ia64/configs/gensparse_defconfig | |||
| @@ -209,4 +209,3 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 209 | CONFIG_DEBUG_KERNEL=y | 209 | CONFIG_DEBUG_KERNEL=y |
| 210 | CONFIG_DEBUG_MUTEXES=y | 210 | CONFIG_DEBUG_MUTEXES=y |
| 211 | CONFIG_CRYPTO_MD5=y | 211 | CONFIG_CRYPTO_MD5=y |
| 212 | CONFIG_MISC_DEVICES=y | ||