diff -r 896cb0d36c1a -r 2858a24a5846 config/arch/avr32.in
--- a/config/arch/avr32.in	Sun May 08 19:02:44 2011 +0200
+++ b/config/arch/avr32.in	Sun Aug 12 07:45:42 2012 -0400
@@ -4,10 +4,10 @@
 ## select ARCH_DEFAULT_32
 ## select ARCH_USE_MMU
 ## select ARCH_DEFAULT_BE
-## select ARCH_SUPPORT_ARCH
-## select ARCH_SUPPORT_CPU
-## select ARCH_SUPPORT_TUNE
-## select ARCH_SUPPORT_FPU
+## select ARCH_SUPPORTS_WITH_ARCH
+## select ARCH_SUPPORTS_WITH_CPU
+## select ARCH_SUPPORTS_WITH_TUNE
+## select ARCH_SUPPORTS_WITH_FPU
 ##
 ## help The AVR32 architecture, as defined by:
 ## help     http://www.atmel.com/products/avr32