diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-05-31 00:10:26 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-31 00:10:26 -0400 |
commit | 8181d3ef26ed1d9eb21e2cdcac374e1f457fdc06 (patch) | |
tree | 1a081f09ebcf2a84de899ddeadd0e4c5e48b50d2 /arch/sh/Kconfig | |
parent | 54525552c6ccfd867e819845da14be994e303218 (diff) | |
parent | 55922c9d1b84b89cb946c777fddccb3247e7df2c (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-fixes-for-linus
Diffstat (limited to 'arch/sh/Kconfig')
-rw-r--r-- | arch/sh/Kconfig | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index a164c9e3c73..f03338c2f08 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
@@ -71,12 +71,6 @@ config GENERIC_CSUM | |||
71 | def_bool y | 71 | def_bool y |
72 | depends on SUPERH64 | 72 | depends on SUPERH64 |
73 | 73 | ||
74 | config GENERIC_FIND_NEXT_BIT | ||
75 | def_bool y | ||
76 | |||
77 | config GENERIC_FIND_BIT_LE | ||
78 | def_bool y | ||
79 | |||
80 | config GENERIC_HWEIGHT | 74 | config GENERIC_HWEIGHT |
81 | def_bool y | 75 | def_bool y |
82 | 76 | ||