---

yaml --- r: 62633 b: refs/heads/master c: 3be20ca h: refs/heads/master i: 62631: b02f74c v: v3
git-mirror · Jul 20, 2007 · 445f87b · 445f87b
1 parent 4cf85a8
commit 445f87b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c9b9123b35e28dd7cb3012f3f8d4ea13a30631c
+refs/heads/master: 3be20cad15107adc423ac812ac7b3330ca195c74
diff --git a/trunk/arch/arm/mach-ixp4xx/common.c b/trunk/arch/arm/mach-ixp4xx/common.c
@@ -188,7 +188,7 @@ static int ixp4xx_set_irq_type(unsigned int irq, unsigned int type)
 	*int_reg |= (int_style << (line * IXP4XX_GPIO_STYLE_SIZE));
 
 	/* Configure the line as an input */
-	gpio_line_config(irq2gpio[irq], IXP4XX_GPIO_IN);
+	gpio_line_config(line, IXP4XX_GPIO_IN);
 
 	return 0;
 }

diff --git a/trunk/arch/arm/mach-ks8695/irq.c b/trunk/arch/arm/mach-ks8695/irq.c
@@ -23,7 +23,6 @@
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
-#include <linux/ptrace.h>
 #include <linux/sysdev.h>
 
 #include <asm/hardware.h>