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/mfashe...
[pandora-kernel.git]
/
arch
/
sh
/
drivers
/
pci
/
ops-cayman.c
diff --git
a/arch/sh/drivers/pci/ops-cayman.c
b/arch/sh/drivers/pci/ops-cayman.c
index
980275f
..
5ccf9ea
100644
(file)
--- a/
arch/sh/drivers/pci/ops-cayman.c
+++ b/
arch/sh/drivers/pci/ops-cayman.c
@@
-2,7
+2,7
@@
#include <linux/init.h>
#include <linux/pci.h>
#include <linux/types.h>
-#include <
asm/
cpu/irq.h>
+#include <cpu/irq.h>
#include "pci-sh5.h"
static inline u8 bridge_swizzle(u8 pin, u8 slot)