Merge branch 'master' of /home/sam/kernel/linux-2.6/

1 files changed, 18 insertions, 6 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index f123c7c9fc98..f81a62380add 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -47,6 +47,18 @@ config MCA
           <file:Documentation/mca.txt> (and especially the web page given
           there) before attempting to build an MCA bus kernel.
 
+config GENERIC_HARDIRQS
+        bool
+        default y
+
+config HARDIRQS_SW_RESEND
+        bool
+        default y
+
+config GENERIC_IRQ_PROBE
+        bool
+        default y
+
 config RWSEM_GENERIC_SPINLOCK
         bool
         default y
@@ -121,11 +133,11 @@ config ARCH_VERSATILE
         help
           This enables support for ARM Ltd Versatile board.
 
-config ARCH_AT91RM9200
-        bool "Atmel AT91RM9200"
+config ARCH_AT91
+        bool "Atmel AT91"
         help
-          Say Y here if you intend to run this kernel on an Atmel
-          AT91RM9200-based board.
+          This enables support for systems based on the Atmel AT91RM9200
+          and AT91SAM9xxx processors.
 
 config ARCH_CLPS7500
         bool "Cirrus CL-PS7500FE"
@@ -547,7 +559,7 @@ config LEDS
                    ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \
                    ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \
                    ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \
-                   ARCH_AT91RM9200
+                   ARCH_AT91RM9200 || MACH_TRIZEPS4
         help
           If you say Y here, the LEDs on your machine will be used
           to provide useful information about your current system status.
@@ -678,7 +690,7 @@ config XIP_PHYS_ADDR
 
 endmenu
 
-if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP1)
+if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP)
 
 menu "CPU Frequency scaling"