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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
arm
/
mach-h720x
/
common.c
diff --git
a/arch/arm/mach-h720x/common.c
b/arch/arm/mach-h720x/common.c
index
96aa3af
..
c096b45
100644
(file)
--- a/
arch/arm/mach-h720x/common.c
+++ b/
arch/arm/mach-h720x/common.c
@@
-108,7
+108,7
@@
h720x_gpio_handler(unsigned int mask, unsigned int irq,
while (mask) {
if (mask & 1) {
IRQDBG("handling irq %d\n", irq);
while (mask) {
if (mask & 1) {
IRQDBG("handling irq %d\n", irq);
- desc
->handle
(irq, desc, regs);
+ desc
_handle_irq
(irq, desc, regs);
}
irq++;
desc++;
}
irq++;
desc++;
@@
-237,7
+237,12
@@
void __init h720x_init_irq (void)
}
static struct map_desc h720x_io_desc[] __initdata = {
}
static struct map_desc h720x_io_desc[] __initdata = {
- { IO_VIRT, IO_PHYS, IO_SIZE, MT_DEVICE },
+ {
+ .virtual = IO_VIRT,
+ .pfn = __phys_to_pfn(IO_PHYS),
+ .length = IO_SIZE,
+ .type = MT_DEVICE
+ },
};
/* Initialize io tables */
};
/* Initialize io tables */