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 'fix' of git://github.com/ycmiao/pxa-linux into fixes
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
powermac
/
pic.c
diff --git
a/arch/powerpc/platforms/powermac/pic.c
b/arch/powerpc/platforms/powermac/pic.c
index
7667db4
..
901bfbd
100644
(file)
--- a/
arch/powerpc/platforms/powermac/pic.c
+++ b/
arch/powerpc/platforms/powermac/pic.c
@@
-24,7
+24,6
@@
#include <linux/syscore_ops.h>
#include <linux/adb.h>
#include <linux/pmu.h>
#include <linux/syscore_ops.h>
#include <linux/adb.h>
#include <linux/pmu.h>
-#include <linux/module.h>
#include <asm/sections.h>
#include <asm/io.h>
#include <asm/sections.h>
#include <asm/io.h>
@@
-273,7
+272,6
@@
static struct irqaction xmon_action = {
static struct irqaction gatwick_cascade_action = {
.handler = gatwick_action,
static struct irqaction gatwick_cascade_action = {
.handler = gatwick_action,
- .flags = IRQF_DISABLED,
.name = "cascade",
};
.name = "cascade",
};