diff -urpN -X ../dontdiff linux-2.6.17-git5-fix1-s3c2412-try2/arch/arm/mach-s3c2410/irq.c linux-2.6.17-git5-fix1-s3c2412-try2-tmp/arch/arm/mach-s3c2410/irq.c
--- linux-2.6.17-git5-fix1-s3c2412-try2/arch/arm/mach-s3c2410/irq.c	2006-06-18 02:49:35.000000000 +0100
+++ linux-2.6.17-git5-fix1-s3c2412-try2-tmp/arch/arm/mach-s3c2410/irq.c	2006-06-23 17:20:27.000000000 +0100
@@ -275,28 +275,28 @@ s3c_irqext_type(unsigned int irq, unsign
 	if ((irq >= IRQ_EINT0) && (irq <= IRQ_EINT3))
 	{
 		gpcon_reg = S3C2410_GPFCON;
-		extint_reg = S3C2410_EXTINT0;
+		extint_reg = S3C24XX_EXTINT0;
 		gpcon_offset = (irq - IRQ_EINT0) * 2;
 		extint_offset = (irq - IRQ_EINT0) * 4;
 	}
 	else if ((irq >= IRQ_EINT4) && (irq <= IRQ_EINT7))
 	{
 		gpcon_reg = S3C2410_GPFCON;
-		extint_reg = S3C2410_EXTINT0;
+		extint_reg = S3C24XX_EXTINT0;
 		gpcon_offset = (irq - (EXTINT_OFF)) * 2;
 		extint_offset = (irq - (EXTINT_OFF)) * 4;
 	}
 	else if ((irq >= IRQ_EINT8) && (irq <= IRQ_EINT15))
 	{
 		gpcon_reg = S3C2410_GPGCON;
-		extint_reg = S3C2410_EXTINT1;
+		extint_reg = S3C24XX_EXTINT1;
 		gpcon_offset = (irq - IRQ_EINT8) * 2;
 		extint_offset = (irq - IRQ_EINT8) * 4;
 	}
 	else if ((irq >= IRQ_EINT16) && (irq <= IRQ_EINT23))
 	{
 		gpcon_reg = S3C2410_GPGCON;
-		extint_reg = S3C2410_EXTINT2;
+		extint_reg = S3C24XX_EXTINT2;
 		gpcon_offset = (irq - IRQ_EINT8) * 2;
 		extint_offset = (irq - IRQ_EINT16) * 4;
 	} else
diff -urpN -X ../dontdiff linux-2.6.17-git5-fix1-s3c2412-try2/arch/arm/mach-s3c2410/s3c2410-gpio.c linux-2.6.17-git5-fix1-s3c2412-try2-tmp/arch/arm/mach-s3c2410/s3c2410-gpio.c
--- linux-2.6.17-git5-fix1-s3c2412-try2/arch/arm/mach-s3c2410/s3c2410-gpio.c	2006-06-18 02:49:35.000000000 +0100
+++ linux-2.6.17-git5-fix1-s3c2412-try2-tmp/arch/arm/mach-s3c2410/s3c2410-gpio.c	2006-06-23 17:18:26.000000000 +0100
@@ -38,7 +38,7 @@
 int s3c2410_gpio_irqfilter(unsigned int pin, unsigned int on,
 			   unsigned int config)
 {
-	void __iomem *reg = S3C2410_EINFLT0;
+	void __iomem *reg = S3C24XX_EINFLT0;
 	unsigned long flags;
 	unsigned long val;
 
@@ -61,10 +61,10 @@ int s3c2410_gpio_irqfilter(unsigned int 
 
 	/* update filter enable */
 
-	val = __raw_readl(S3C2410_EXTINT2);
+	val = __raw_readl(S3C24XX_EXTINT2);
 	val &= ~(1 << ((pin * 4) + 3));
 	val |= on << ((pin * 4) + 3);
-	__raw_writel(val, S3C2410_EXTINT2);
+	__raw_writel(val, S3C24XX_EXTINT2);
 
 	local_irq_restore(flags);