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]
/
drivers
/
parisc
/
gsc.c
diff --git
a/drivers/parisc/gsc.c
b/drivers/parisc/gsc.c
index
b45aa5c
..
16d40f9
100644
(file)
--- a/
drivers/parisc/gsc.c
+++ b/
drivers/parisc/gsc.c
@@
-14,6
+14,7
@@
*/
#include <linux/bitops.h>
*/
#include <linux/bitops.h>
+#include <linux/config.h>
#include <linux/errno.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/errno.h>
#include <linux/init.h>
#include <linux/interrupt.h>
@@
-108,7
+109,7
@@
int gsc_find_local_irq(unsigned int irq, int *global_irqs, int limit)
static void gsc_asic_disable_irq(unsigned int irq)
{
static void gsc_asic_disable_irq(unsigned int irq)
{
- struct gsc_asic *irq_dev = irq_desc[irq].
chip
_data;
+ struct gsc_asic *irq_dev = irq_desc[irq].
handler
_data;
int local_irq = gsc_find_local_irq(irq, irq_dev->global_irq, 32);
u32 imr;
int local_irq = gsc_find_local_irq(irq, irq_dev->global_irq, 32);
u32 imr;
@@
-123,7
+124,7
@@
static void gsc_asic_disable_irq(unsigned int irq)
static void gsc_asic_enable_irq(unsigned int irq)
{
static void gsc_asic_enable_irq(unsigned int irq)
{
- struct gsc_asic *irq_dev = irq_desc[irq].
chip
_data;
+ struct gsc_asic *irq_dev = irq_desc[irq].
handler
_data;
int local_irq = gsc_find_local_irq(irq, irq_dev->global_irq, 32);
u32 imr;
int local_irq = gsc_find_local_irq(irq, irq_dev->global_irq, 32);
u32 imr;
@@
-163,8
+164,8
@@
int gsc_assign_irq(struct hw_interrupt_type *type, void *data)
if (irq > GSC_IRQ_MAX)
return NO_IRQ;
if (irq > GSC_IRQ_MAX)
return NO_IRQ;
- irq_desc[irq].
chip
= type;
- irq_desc[irq].
chip
_data = data;
+ irq_desc[irq].
handler
= type;
+ irq_desc[irq].
handler
_data = data;
return irq++;
}
return irq++;
}