Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
  avr32: update default configurations for ATNGW100, ATSTK1002 and ATSTK1006
  avr32: add default configurations for ATNGW100 mkII and EVKLCD10X
  avr32: add support for ATNGW100 mkII board
  avr32: convert to asm-generic/hardirq.h
  avr32: add two new at91 to cpu.h definition
  avr32: clean up linker script using standard macros.
  avr32: MRMT: correct setup of SPI slaves
  avr32: function for independently setting up SPI slaves
  avr32: re-instate MCI WP/CD pin assignments for ATNGW100

1 files changed, 11 insertions, 2 deletions

diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index d856354f4272..f2b319333184 100644
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -112,6 +112,11 @@ config CPU_AT32AP7002
         bool
         select CPU_AT32AP700X
 
+# AP700X boards
+config BOARD_ATNGW100_COMMON
+        bool
+        select CPU_AT32AP7000
+
 choice
         prompt "AVR32 board type"
         default BOARD_ATSTK1000
@@ -119,9 +124,13 @@ choice
 config BOARD_ATSTK1000
         bool "ATSTK1000 evaluation board"
 
-config BOARD_ATNGW100
+config BOARD_ATNGW100_MKI
         bool "ATNGW100 Network Gateway"
-        select CPU_AT32AP7000
+        select BOARD_ATNGW100_COMMON
+
+config BOARD_ATNGW100_MKII
+        bool "ATNGW100 mkII Network Gateway"
+        select BOARD_ATNGW100_COMMON
 
 config BOARD_HAMMERHEAD
         bool "Hammerhead board"