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]
/
include
/
asm-mips
/
marvell.h
diff --git
a/include/asm-mips/marvell.h
b/include/asm-mips/marvell.h
index
2e3bc67
..
df94955
100644
(file)
--- a/
include/asm-mips/marvell.h
+++ b/
include/asm-mips/marvell.h
@@
-11,7
+11,6
@@
#include <linux/pci.h>
#include <asm/byteorder.h>
-#include <asm/pci_channel.h>
extern unsigned long marvell_base;
@@
-54,4
+53,6
@@
struct mv_pci_controller {
unsigned long config_vreg;
};
+extern void ll_mv64340_irq(void);
+
#endif /* __ASM_MIPS_MARVELL_H */