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 branch 'for-linus' of git://oss.sgi.com/xfs/xfs
[pandora-kernel.git]
/
arch
/
cris
/
arch-v10
/
kernel
/
irq.c
diff --git
a/arch/cris/arch-v10/kernel/irq.c
b/arch/cris/arch-v10/kernel/irq.c
index
e06ab00
..
5d75f77
100644
(file)
--- a/
arch/cris/arch-v10/kernel/irq.c
+++ b/
arch/cris/arch-v10/kernel/irq.c
@@
-1,5
+1,4
@@
-/* $Id: irq.c,v 1.4 2005/01/04 12:22:28 starvik Exp $
- *
+/*
* linux/arch/cris/kernel/irq.c
*
* Copyright (c) 2000-2002 Axis Communications AB
* linux/arch/cris/kernel/irq.c
*
* Copyright (c) 2000-2002 Axis Communications AB
@@
-18,10
+17,6
@@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/init.h>
-/* From kgdb.c. */
-extern void kgdb_init(void);
-extern void breakpoint(void);
-
#define mask_irq(irq_nr) (*R_VECT_MASK_CLR = 1 << (irq_nr));
#define unmask_irq(irq_nr) (*R_VECT_MASK_SET = 1 << (irq_nr));
#define mask_irq(irq_nr) (*R_VECT_MASK_CLR = 1 << (irq_nr));
#define unmask_irq(irq_nr) (*R_VECT_MASK_SET = 1 << (irq_nr));
@@
-137,7
+132,7
@@
static void end_crisv10_irq(unsigned int irq)
{
}
{
}
-static struct
hw_interrupt_type
crisv10_irq_type = {
+static struct
irq_chip
crisv10_irq_type = {
.typename = "CRISv10",
.startup = startup_crisv10_irq,
.shutdown = shutdown_crisv10_irq,
.typename = "CRISv10",
.startup = startup_crisv10_irq,
.shutdown = shutdown_crisv10_irq,