3 files changed, 12 insertions, 10 deletions

diff --git a/arch/mips/alchemy/Kconfig b/arch/mips/alchemy/Kconfig
index 22f4ff5103c1..df3b1a7eb15d 100644
--- a/arch/mips/alchemy/Kconfig
+++ b/arch/mips/alchemy/Kconfig
@@ -1,5 +1,5 @@
-# au1000-style gpio
-config ALCHEMY_GPIO_AU1000
+# au1000-style gpio and interrupt controllers
+config ALCHEMY_GPIOINT_AU1000
         bool
 
 # select this in your board config if you don't want to use the gpio
@@ -133,27 +133,27 @@ endchoice
 config SOC_AU1000
         bool
         select SOC_AU1X00
-        select ALCHEMY_GPIO_AU1000
+        select ALCHEMY_GPIOINT_AU1000
 
 config SOC_AU1100
         bool
         select SOC_AU1X00
-        select ALCHEMY_GPIO_AU1000
+        select ALCHEMY_GPIOINT_AU1000
 
 config SOC_AU1500
         bool
         select SOC_AU1X00
-        select ALCHEMY_GPIO_AU1000
+        select ALCHEMY_GPIOINT_AU1000
 
 config SOC_AU1550
         bool
         select SOC_AU1X00
-        select ALCHEMY_GPIO_AU1000
+        select ALCHEMY_GPIOINT_AU1000
 
 config SOC_AU1200
         bool
         select SOC_AU1X00
-        select ALCHEMY_GPIO_AU1000
+        select ALCHEMY_GPIOINT_AU1000
 
 config SOC_AU1X00
         bool
diff --git a/arch/mips/alchemy/common/Makefile b/arch/mips/alchemy/common/Makefile
index abf0eb19051e..f46b351a961d 100644
--- a/arch/mips/alchemy/common/Makefile
+++ b/arch/mips/alchemy/common/Makefile
@@ -5,14 +5,16 @@
 # Makefile for the Alchemy Au1xx0 CPUs, generic files.
 #
 
-obj-y += prom.o irq.o time.o reset.o \
+obj-y += prom.o time.o reset.o \
         clocks.o platform.o power.o setup.o \
         sleeper.o dma.o dbdma.o
 
+obj-$(CONFIG_ALCHEMY_GPIOINT_AU1000) += irq.o
+
 # optional gpiolib support
 ifeq ($(CONFIG_ALCHEMY_GPIO_INDIRECT),)
  ifeq ($(CONFIG_GPIOLIB),y)
-  obj-$(CONFIG_ALCHEMY_GPIO_AU1000) += gpiolib-au1000.o
+  obj-$(CONFIG_ALCHEMY_GPIOINT_AU1000) += gpiolib-au1000.o
  endif
 endif
 
diff --git a/arch/mips/include/asm/mach-au1x00/gpio.h b/arch/mips/include/asm/mach-au1x00/gpio.h
index f9b7d41c659a..c3f60cdc3203 100644
--- a/arch/mips/include/asm/mach-au1x00/gpio.h
+++ b/arch/mips/include/asm/mach-au1x00/gpio.h
@@ -1,7 +1,7 @@
 #ifndef _ALCHEMY_GPIO_H_
 #define _ALCHEMY_GPIO_H_
 
-#if defined(CONFIG_ALCHEMY_GPIO_AU1000)
+#if defined(CONFIG_ALCHEMY_GPIOINT_AU1000)
 
 #include <asm/mach-au1x00/gpio-au1000.h>