diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 13:49:45 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 13:49:45 -0400 |
| commit | 026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (patch) | |
| tree | 2624a44924c625c367f3cebf937853b9da2de282 /arch/arm/kernel/ecard.c | |
| parent | 9f2fa466383ce100b90fe52cb4489d7a26bf72a9 (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'arch/arm/kernel/ecard.c')
| -rw-r--r-- | arch/arm/kernel/ecard.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c index 00aa225e8d95..ab4ad9562eee 100644 --- a/arch/arm/kernel/ecard.c +++ b/arch/arm/kernel/ecard.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | */ | 27 | */ |
| 28 | #define ECARD_C | 28 | #define ECARD_C |
| 29 | 29 | ||
| 30 | #include <linux/config.h> | ||
| 31 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 32 | #include <linux/kernel.h> | 31 | #include <linux/kernel.h> |
| 33 | #include <linux/types.h> | 32 | #include <linux/types.h> |
| @@ -620,7 +619,7 @@ ecard_irqexp_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *reg | |||
| 620 | ecard_t *ec = slot_to_ecard(slot); | 619 | ecard_t *ec = slot_to_ecard(slot); |
| 621 | 620 | ||
| 622 | if (ec->claimed) { | 621 | if (ec->claimed) { |
| 623 | struct irqdesc *d = irqdesc + ec->irq; | 622 | struct irq_desc *d = irq_desc + ec->irq; |
| 624 | /* | 623 | /* |
| 625 | * this ugly code is so that we can operate a | 624 | * this ugly code is so that we can operate a |
| 626 | * prioritorising system: | 625 | * prioritorising system: |