Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[linux-2.6-omap-h63xx.git] / arch / avr32 / Kconfig

diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index 50fee549e1cd75ace8112180d9f7c8c177fffa3f..3ec76586877ef0f462afbd54296d1db0c29ab320 100644 (file)
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -57,9 +57,6 @@ config ARCH_HAS_ILOG2_U64
        bool
        default n
 
-config GENERIC_BUST_SPINLOCK
-       bool
-
 config GENERIC_HWEIGHT
        bool
        default y