diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
| commit | c4366889dda8110247be59ca41fddb82951a8c26 (patch) | |
| tree | 705c1a996bed8fd48ce94ff33ec9fd00f9b94875 /arch/m68k/Kconfig | |
| parent | db2fb9db5735cc532fd4fc55e94b9a3c3750378e (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Conflicts:
drivers/cpufreq/cpufreq.c
Diffstat (limited to 'arch/m68k/Kconfig')
| -rw-r--r-- | arch/m68k/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index 7bc14461a6ac..70a577c89c7c 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig | |||
| @@ -17,6 +17,14 @@ config RWSEM_GENERIC_SPINLOCK | |||
| 17 | config RWSEM_XCHGADD_ALGORITHM | 17 | config RWSEM_XCHGADD_ALGORITHM |
| 18 | bool | 18 | bool |
| 19 | 19 | ||
| 20 | config ARCH_HAS_ILOG2_U32 | ||
| 21 | bool | ||
| 22 | default n | ||
| 23 | |||
| 24 | config ARCH_HAS_ILOG2_U64 | ||
| 25 | bool | ||
| 26 | default n | ||
| 27 | |||
| 20 | config GENERIC_HWEIGHT | 28 | config GENERIC_HWEIGHT |
| 21 | bool | 29 | bool |
| 22 | default y | 30 | default y |