Commit dbbe2206 authored by David S. Miller's avatar David S. Miller

Merge nuts.ninka.net:/home/davem/src/BK/sparcwork-2.5

into nuts.ninka.net:/home/davem/src/BK/sparc-2.5
parents c9e54010 30eaf295
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
BTFIXUPDEF_CALL(char *, __irq_itoa, unsigned int) BTFIXUPDEF_CALL(char *, __irq_itoa, unsigned int)
#define __irq_itoa(irq) BTFIXUP_CALL(__irq_itoa)(irq) #define __irq_itoa(irq) BTFIXUP_CALL(__irq_itoa)(irq)
#define NR_IRQS 15 #define NR_IRQS 16
#define irq_cannonicalize(irq) (irq) #define irq_cannonicalize(irq) (irq)
......
...@@ -110,7 +110,7 @@ static __inline__ char *__irq_itoa(unsigned int irq) ...@@ -110,7 +110,7 @@ static __inline__ char *__irq_itoa(unsigned int irq)
return buff; return buff;
} }
#define NR_IRQS 15 #define NR_IRQS 16
#define irq_cannonicalize(irq) (irq) #define irq_cannonicalize(irq) (irq)
extern void disable_irq(unsigned int); extern void disable_irq(unsigned int);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment