Merge git://git.infradead.org/battery-2.6

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

diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index ce4013a..bbecbd8 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
@@ -68,6 +65,11 @@ config GENERIC_CALIBRATE_DELAY
        bool
        default y
 
+config GENERIC_BUG
+       bool
+       default y
+       depends on BUG
+
 source "init/Kconfig"
 
 menu "System Type and features"
@@ -106,8 +108,15 @@ choice
 config BOARD_ATSTK1000
        bool "ATSTK1000 evaluation board"
        select BOARD_ATSTK1002 if CPU_AT32AP7000
+
+config BOARD_ATNGW100
+       bool "ATNGW100 Network Gateway"
 endchoice
 
+if BOARD_ATSTK1000
+source "arch/avr32/boards/atstk1000/Kconfig"
+endif
+
 choice
        prompt "Boot loader type"
        default LOADER_U_BOOT
@@ -116,6 +125,8 @@ config      LOADER_U_BOOT
        bool "U-Boot (or similar) bootloader"
 endchoice
 
+source "arch/avr32/mach-at32ap/Kconfig"
+
 config LOAD_ADDRESS
        hex
        default 0x10000000 if LOADER_U_BOOT=y && CPU_AT32AP7000=y
@@ -178,6 +189,27 @@ config CMDLINE
 
 endmenu
 
+menu "Power management options"
+
+menu "CPU Frequency scaling"
+
+source "drivers/cpufreq/Kconfig"
+
+config CPU_FREQ_AT32AP
+       bool "CPU frequency driver for AT32AP"
+       depends on CPU_FREQ && PLATFORM_AT32AP
+       default n
+       help
+         This enables the CPU frequency driver for AT32AP processors.
+
+         For details, take a look in <file:Documentation/cpu-freq>.
+
+         If in doubt, say N.
+
+endmenu
+
+endmenu
+
 menu "Bus options"
 
 config PCI