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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
ppc
/
syslib
/
open_pic2.c
diff --git
a/arch/ppc/syslib/open_pic2.c
b/arch/ppc/syslib/open_pic2.c
index
1c40049
..
d585207
100644
(file)
--- a/
arch/ppc/syslib/open_pic2.c
+++ b/
arch/ppc/syslib/open_pic2.c
@@
-1,6
+1,4
@@
/*
/*
- * arch/ppc/kernel/open_pic.c -- OpenPIC Interrupt Handling
- *
* Copyright (C) 1997 Geert Uytterhoeven
*
* This file is subject to the terms and conditions of the GNU General Public
* Copyright (C) 1997 Geert Uytterhoeven
*
* This file is subject to the terms and conditions of the GNU General Public
@@
-12,7
+10,6
@@
* register accesses
*/
* register accesses
*/
-#include <linux/config.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/sched.h>
@@
-292,7
+289,7
@@
void __init openpic2_init(int offset)
/* Init descriptors */
for (i = offset; i < NumSources + offset; i++)
/* Init descriptors */
for (i = offset; i < NumSources + offset; i++)
- irq_desc[i].
handler
= &open_pic2;
+ irq_desc[i].
chip
= &open_pic2;
/* Initialize the spurious interrupt */
if (ppc_md.progress) ppc_md.progress("openpic2: spurious",0x3bd);
/* Initialize the spurious interrupt */
if (ppc_md.progress) ppc_md.progress("openpic2: spurious",0x3bd);
@@
-532,7
+529,7
@@
static void openpic2_end_irq(unsigned int irq_nr)
}
int
}
int
-openpic2_get_irq(
struct pt_regs *regs
)
+openpic2_get_irq(
void
)
{
int irq = openpic2_irq();
{
int irq = openpic2_irq();