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]
/
arch
/
ppc
/
syslib
/
ppc403_pic.c
diff --git
a/arch/ppc/syslib/ppc403_pic.c
b/arch/ppc/syslib/ppc403_pic.c
index
06cb0af
..
607ebd1
100644
(file)
--- a/
arch/ppc/syslib/ppc403_pic.c
+++ b/
arch/ppc/syslib/ppc403_pic.c
@@
-26,6
+26,7
@@
#include <asm/system.h>
#include <asm/irq.h>
#include <asm/ppc4xx_pic.h>
#include <asm/system.h>
#include <asm/irq.h>
#include <asm/ppc4xx_pic.h>
+#include <asm/machdep.h>
/* Function Prototypes */
/* Function Prototypes */
@@
-34,17
+35,14
@@
static void ppc403_aic_disable(unsigned int irq);
static void ppc403_aic_disable_and_ack(unsigned int irq);
static struct hw_interrupt_type ppc403_aic = {
static void ppc403_aic_disable_and_ack(unsigned int irq);
static struct hw_interrupt_type ppc403_aic = {
- "403GC AIC",
- NULL,
- NULL,
- ppc403_aic_enable,
- ppc403_aic_disable,
- ppc403_aic_disable_and_ack,
- 0
+ .typename = "403GC AIC",
+ .enable = ppc403_aic_enable,
+ .disable = ppc403_aic_disable,
+ .ack = ppc403_aic_disable_and_ack,
};
int
};
int
-ppc403_pic_get_irq(
struct pt_regs *regs
)
+ppc403_pic_get_irq(
void
)
{
int irq;
unsigned long bits;
{
int irq;
unsigned long bits;
@@
-123,5
+121,5
@@
ppc4xx_pic_init(void)
ppc_md.get_irq = ppc403_pic_get_irq;
for (i = 0; i < NR_IRQS; i++)
ppc_md.get_irq = ppc403_pic_get_irq;
for (i = 0; i < NR_IRQS; i++)
- irq_desc[i].
handler
= &ppc403_aic;
+ irq_desc[i].
chip
= &ppc403_aic;
}
}