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
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
arch
/
arm
/
kernel
/
ecard.c
diff --git
a/arch/arm/kernel/ecard.c
b/arch/arm/kernel/ecard.c
index
3e14b13
..
00aa225
100644
(file)
--- a/
arch/arm/kernel/ecard.c
+++ b/
arch/arm/kernel/ecard.c
@@
-27,6
+27,7
@@
*/
#define ECARD_C
*/
#define ECARD_C
+#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/types.h>
@@
-295,7
+296,7
@@
ecard_task(void * unused)
*/
static void ecard_call(struct ecard_request *req)
{
*/
static void ecard_call(struct ecard_request *req)
{
- DECLARE_COMPLETION
_ONSTACK
(completion);
+ DECLARE_COMPLETION(completion);
req->complete = &completion;
req->complete = &completion;
@@
-470,8
+471,7
@@
static void ecard_irq_mask(unsigned int irqnr)
}
}
}
}
-static struct irq_chip ecard_chip = {
- .name = "ECARD",
+static struct irqchip ecard_chip = {
.ack = ecard_irq_mask,
.mask = ecard_irq_mask,
.unmask = ecard_irq_unmask,
.ack = ecard_irq_mask,
.mask = ecard_irq_mask,
.unmask = ecard_irq_unmask,
@@
-620,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:
@@
-884,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
x %08
x %08lx\n",
+ str += sprintf(str, "%08
lx %08l
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);