git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge ../linux-2.6
[pandora-kernel.git]
/
arch
/
arm
/
kernel
/
ecard.c
diff --git
a/arch/arm/kernel/ecard.c
b/arch/arm/kernel/ecard.c
index
68a2576
..
eca248d
100644
(file)
--- a/
arch/arm/kernel/ecard.c
+++ b/
arch/arm/kernel/ecard.c
@@
-470,7
+470,8
@@
static void ecard_irq_mask(unsigned int irqnr)
}
}
}
}
-static struct irqchip ecard_chip = {
+static struct irq_chip ecard_chip = {
+ .name = "ECARD",
.ack = ecard_irq_mask,
.mask = ecard_irq_mask,
.unmask = ecard_irq_unmask,
.ack = ecard_irq_mask,
.mask = ecard_irq_mask,
.unmask = ecard_irq_unmask,
@@
-619,7
+620,7
@@
ecard_irqexp_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *reg
ecard_t *ec = slot_to_ecard(slot);
if (ec->claimed) {
ecard_t *ec = slot_to_ecard(slot);
if (ec->claimed) {
- struct irq
desc *d = irq
desc + ec->irq;
+ struct irq
_desc *d = irq_
desc + ec->irq;
/*
* this ugly code is so that we can operate a
* prioritorising system:
/*
* this ugly code is so that we can operate a
* prioritorising system:
@@
-883,7
+884,7
@@
static ssize_t ecard_show_resources(struct device *dev, struct device_attribute
int i;
for (i = 0; i < ECARD_NUM_RESOURCES; i++)
int i;
for (i = 0; i < ECARD_NUM_RESOURCES; i++)
- str += sprintf(str, "%08
lx %08l
x %08lx\n",
+ str += sprintf(str, "%08
x %08
x %08lx\n",
ec->resource[i].start,
ec->resource[i].end,
ec->resource[i].flags);
ec->resource[i].start,
ec->resource[i].end,
ec->resource[i].flags);