diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
| commit | 95d465fd750897ab32462a6702fbfe1b122cbbc0 (patch) | |
| tree | 65c38b2f11c51bb6932e44dd6c92f15b0091abfe /arch/cris/Kconfig | |
| parent | 642fde17dceceb56c7ba2762733ac688666ae657 (diff) | |
| parent | 683aa4012f53b2ada0f430487e05d37b0d94e90a (diff) | |
Manual merge with Linus.
Conflicts:
arch/powerpc/kernel/setup-common.c
drivers/input/keyboard/hil_kbd.c
drivers/input/mouse/hil_ptr.c
Diffstat (limited to 'arch/cris/Kconfig')
| -rw-r--r-- | arch/cris/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig index b83261949737..856b665020e7 100644 --- a/arch/cris/Kconfig +++ b/arch/cris/Kconfig | |||
| @@ -16,6 +16,14 @@ config RWSEM_GENERIC_SPINLOCK | |||
| 16 | config RWSEM_XCHGADD_ALGORITHM | 16 | config RWSEM_XCHGADD_ALGORITHM |
| 17 | bool | 17 | bool |
| 18 | 18 | ||
| 19 | config GENERIC_FIND_NEXT_BIT | ||
| 20 | bool | ||
| 21 | default y | ||
| 22 | |||
| 23 | config GENERIC_HWEIGHT | ||
| 24 | bool | ||
| 25 | default y | ||
| 26 | |||
| 19 | config GENERIC_CALIBRATE_DELAY | 27 | config GENERIC_CALIBRATE_DELAY |
| 20 | bool | 28 | bool |
| 21 | default y | 29 | default y |