Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[pandora-kernel.git] / arch / sh64 / Kconfig

diff --git a/arch/sh64/Kconfig b/arch/sh64/Kconfig
index 4c3e533..fb35b45 100644 (file)
--- 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