Merge branches 'boards' and 'fixes' of git://git.kernel.org/pub/scm/linux/kernel...

[h-e-n] / arch / avr32 / Kconfig

diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index 33a5b29..26eca87 100644 (file)
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -121,11 +121,19 @@ config BOARD_ATSTK1000
 config BOARD_ATNGW100
        bool "ATNGW100 Network Gateway"
        select CPU_AT32AP7000
+
+config BOARD_FAVR_32
+       bool "Favr-32 LCD-board"
+       select CPU_AT32AP7000
+
+config BOARD_MIMC200
+       bool "MIMC200 CPU board"
+       select CPU_AT32AP7000
 endchoice
 
-if BOARD_ATSTK1000
 source "arch/avr32/boards/atstk1000/Kconfig"
-endif
+source "arch/avr32/boards/atngw100/Kconfig"
+source "arch/avr32/boards/favr-32/Kconfig"
 
 choice
        prompt "Boot loader type"