Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[mv-sheeva.git] / arch / arm / plat-iop / i2c.c

diff --git a/arch/arm/plat-iop/i2c.c b/arch/arm/plat-iop/i2c.c
index 7ae149c2e982d50ff121907110e5a6cd3b1359d0..e99909bdba71ef5d46804fe013364cb995805654 100644 (file)
--- a/arch/arm/plat-iop/i2c.c
+++ b/arch/arm/plat-iop/i2c.c
@@ -31,12 +31,12 @@
 #include <asm/mach/arch.h>
 
 #ifdef CONFIG_ARCH_IOP32X
-#define IRQ_IOP3XX_I2C_0       IRQ_IOP321_I2C_0
-#define IRQ_IOP3XX_I2C_1       IRQ_IOP321_I2C_1
+#define IRQ_IOP3XX_I2C_0       IRQ_IOP32X_I2C_0
+#define IRQ_IOP3XX_I2C_1       IRQ_IOP32X_I2C_1
 #endif
 #ifdef CONFIG_ARCH_IOP33X
-#define IRQ_IOP3XX_I2C_0       IRQ_IOP331_I2C_0
-#define IRQ_IOP3XX_I2C_1       IRQ_IOP331_I2C_1
+#define IRQ_IOP3XX_I2C_0       IRQ_IOP33X_I2C_0
+#define IRQ_IOP3XX_I2C_1       IRQ_IOP33X_I2C_1
 #endif
 
 static struct resource iop3xx_i2c0_resources[] = {