git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
[sfrench/cifs-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 b8154efff6ede2c7a14224a920542b4650488dac..d585207f9f77855e0c8f126dfc52014fbc4328af 100644
(file)
--- a/
arch/ppc/syslib/open_pic2.c
+++ b/
arch/ppc/syslib/open_pic2.c
@@
-10,7
+10,6
@@
* register accesses
*/
-#include <linux/config.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/sched.h>
@@
-530,7
+529,7
@@
static void openpic2_end_irq(unsigned int irq_nr)
}
int
-openpic2_get_irq(
struct pt_regs *regs
)
+openpic2_get_irq(
void
)
{
int irq = openpic2_irq();