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 Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
mips
/
au1000
/
pb1000
/
irqmap.c
diff --git
a/arch/mips/au1000/pb1000/irqmap.c
b/arch/mips/au1000/pb1000/irqmap.c
index
215b07a
..
156500b
100644
(file)
--- a/
arch/mips/au1000/pb1000/irqmap.c
+++ b/
arch/mips/au1000/pb1000/irqmap.c
@@
-39,16
+39,16
@@
#include <linux/slab.h>
#include <linux/random.h>
#include <linux/delay.h>
#include <linux/slab.h>
#include <linux/random.h>
#include <linux/delay.h>
+#include <linux/bitops.h>
-#include <asm/bitops.h>
#include <asm/bootinfo.h>
#include <asm/io.h>
#include <asm/mipsregs.h>
#include <asm/system.h>
#include <asm/bootinfo.h>
#include <asm/io.h>
#include <asm/mipsregs.h>
#include <asm/system.h>
-#include <asm/au1000.h>
+#include <asm/
mach-au1x00/
au1000.h>
-au1xxx_irq_map_t au1xxx_irq_map[] = {
+au1xxx_irq_map_t
__initdata
au1xxx_irq_map[] = {
{ AU1000_GPIO_15, INTC_INT_LOW_LEVEL, 0 },
};
{ AU1000_GPIO_15, INTC_INT_LOW_LEVEL, 0 },
};
-int
au1xxx_nr_irqs = sizeof(au1xxx_irq_map)/sizeof(au1xxx_irq_map_t
);
+int
__initdata au1xxx_nr_irqs = ARRAY_SIZE(au1xxx_irq_map
);