diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-09-09 20:14:47 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-09-09 20:14:47 -0500 |
| commit | d344c5e0856ad03278d8700b503762dbc8b86e12 (patch) | |
| tree | a6d893a643470a3c2580a58f3228a55fa1fd1d82 /arch/sh64/Kconfig | |
| parent | 010988e888a0abbe7118635c1b33d049caae6b29 (diff) | |
| parent | 87fc767b832ef5a681a0ff9d203c3289bc3be2bf (diff) | |
Manual merge with Linus
Diffstat (limited to 'arch/sh64/Kconfig')
| -rw-r--r-- | arch/sh64/Kconfig | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/sh64/Kconfig b/arch/sh64/Kconfig index 4c3e5334adb..fb35b45dc13 100644 --- a/arch/sh64/Kconfig +++ b/arch/sh64/Kconfig @@ -29,10 +29,6 @@ config GENERIC_CALIBRATE_DELAY bool default y -config LOG_BUF_SHIFT - int - default 14 - config RWSEM_XCHGADD_ALGORITHM bool |