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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-ppc
/
mv64x60.h
diff --git
a/include/asm-ppc/mv64x60.h
b/include/asm-ppc/mv64x60.h
index
4f2405b
..
db3776f
100644
(file)
--- a/
include/asm-ppc/mv64x60.h
+++ b/
include/asm-ppc/mv64x60.h
@@
-17,7
+17,6
@@
#include <linux/init.h>
#include <linux/pci.h>
#include <linux/slab.h>
#include <linux/init.h>
#include <linux/pci.h>
#include <linux/slab.h>
-#include <linux/config.h>
#include <asm/byteorder.h>
#include <asm/io.h>
#include <asm/byteorder.h>
#include <asm/io.h>
@@
-337,9
+336,9
@@
int mv64x60_pci_exclude_device(u8 bus, u8 devfn);
void gt64260_init_irq(void);
void gt64260_init_irq(void);
-int gt64260_get_irq(
struct pt_regs *regs
);
+int gt64260_get_irq(
void
);
void mv64360_init_irq(void);
void mv64360_init_irq(void);
-int mv64360_get_irq(
struct pt_regs *regs
);
+int mv64360_get_irq(
void
);
u32 mv64x60_mask(u32 val, u32 num_bits);
u32 mv64x60_shift_left(u32 val, u32 num_bits);
u32 mv64x60_mask(u32 val, u32 num_bits);
u32 mv64x60_shift_left(u32 val, u32 num_bits);