From 445f87b894cbd9dac4deecee350ef12e83ff5c81 Mon Sep 17 00:00:00 2001
From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sun, 15 Jul 2007 12:21:37 +0100
Subject: [PATCH] --- yaml --- r: 62633 b: refs/heads/master c:
 3be20cad15107adc423ac812ac7b3330ca195c74 h: refs/heads/master i:   62631:
 b02f74cec219a94d8a69c0d31b395b1794fc8bac v: v3

---
 [refs]                              | 2 +-
 trunk/arch/arm/mach-ixp4xx/common.c | 2 +-
 trunk/arch/arm/mach-ks8695/irq.c    | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 9f1129257b2b..22fb972acff9 100644
--- 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
index 4c54a86eda3a..8112f726ffa0 100644
--- 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
index 2407bba00547..4c3ab43e1046 100644
--- 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>