git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
arm
/
mach-ixp4xx
/
common.c
diff --git
a/arch/arm/mach-ixp4xx/common.c
b/arch/arm/mach-ixp4xx/common.c
index
00b761f
..
fbadf30
100644
(file)
--- a/
arch/arm/mach-ixp4xx/common.c
+++ b/
arch/arm/mach-ixp4xx/common.c
@@
-91,7
+91,7
@@
static void ixp4xx_config_irq(unsigned irq, enum ixp4xx_irq_type type);
/*
* IRQ -> GPIO mapping table
*/
/*
* IRQ -> GPIO mapping table
*/
-static
signed char
irq2gpio[32] = {
+static
int
irq2gpio[32] = {
-1, -1, -1, -1, -1, -1, 0, 1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, 2, 3, 4, 5, 6,
-1, -1, -1, -1, -1, -1, 0, 1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, 2, 3, 4, 5, 6,
@@
-153,9
+153,6
@@
static int ixp4xx_set_irq_type(unsigned int irq, unsigned int type)
/* Set the new style */
*int_reg |= (int_style << (line * IXP4XX_GPIO_STYLE_SIZE));
/* Set the new style */
*int_reg |= (int_style << (line * IXP4XX_GPIO_STYLE_SIZE));
- /* Configure the line as an input */
- gpio_line_config(line, IXP4XX_GPIO_IN);
-
return 0;
}
return 0;
}