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 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
[pandora-kernel.git]
/
arch
/
mips
/
jazz
/
irq.c
diff --git
a/arch/mips/jazz/irq.c
b/arch/mips/jazz/irq.c
index
260df47
..
ca9bd20
100644
(file)
--- a/
arch/mips/jazz/irq.c
+++ b/
arch/mips/jazz/irq.c
@@
-7,6
+7,7
@@
* Copyright (C) 1994 - 2001, 2003, 07 Ralf Baechle
*/
#include <linux/clockchips.h>
* Copyright (C) 1994 - 2001, 2003, 07 Ralf Baechle
*/
#include <linux/clockchips.h>
+#include <linux/i8253.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
@@
-15,7
+16,6
@@
#include <linux/irq.h>
#include <asm/irq_cpu.h>
#include <linux/irq.h>
#include <asm/irq_cpu.h>
-#include <asm/i8253.h>
#include <asm/i8259.h>
#include <asm/io.h>
#include <asm/jazz.h>
#include <asm/i8259.h>
#include <asm/io.h>
#include <asm/jazz.h>