diff options
-rw-r--r-- | arch/mips/au1000/common/au1xxx_irqmap.c | 2 | ||||
-rw-r--r-- | arch/mips/au1000/common/irq.c | 6 | ||||
-rw-r--r-- | arch/mips/au1000/db1x00/irqmap.c | 2 | ||||
-rw-r--r-- | arch/mips/au1000/mtx-1/irqmap.c | 2 | ||||
-rw-r--r-- | arch/mips/au1000/pb1000/irqmap.c | 2 | ||||
-rw-r--r-- | arch/mips/au1000/pb1100/irqmap.c | 2 | ||||
-rw-r--r-- | arch/mips/au1000/pb1200/irqmap.c | 2 | ||||
-rw-r--r-- | arch/mips/au1000/pb1500/irqmap.c | 2 | ||||
-rw-r--r-- | arch/mips/au1000/pb1550/irqmap.c | 2 | ||||
-rw-r--r-- | arch/mips/au1000/xxs1500/irqmap.c | 2 | ||||
-rw-r--r-- | include/asm-mips/mach-au1x00/au1000.h | 6 |
11 files changed, 15 insertions, 15 deletions
diff --git a/arch/mips/au1000/common/au1xxx_irqmap.c b/arch/mips/au1000/common/au1xxx_irqmap.c index 7acfe9bf5fc3..98a4e34b0248 100644 --- a/arch/mips/au1000/common/au1xxx_irqmap.c +++ b/arch/mips/au1000/common/au1xxx_irqmap.c | |||
@@ -54,7 +54,7 @@ | |||
54 | * Careful if you change match 2 request! | 54 | * Careful if you change match 2 request! |
55 | * The interrupt handler is called directly from the low level dispatch code. | 55 | * The interrupt handler is called directly from the low level dispatch code. |
56 | */ | 56 | */ |
57 | au1xxx_irq_map_t __initdata au1xxx_ic0_map[] = { | 57 | struct au1xxx_irqmap __initdata au1xxx_ic0_map[] = { |
58 | 58 | ||
59 | #if defined(CONFIG_SOC_AU1000) | 59 | #if defined(CONFIG_SOC_AU1000) |
60 | { AU1000_UART0_INT, INTC_INT_HIGH_LEVEL, 0}, | 60 | { AU1000_UART0_INT, INTC_INT_HIGH_LEVEL, 0}, |
diff --git a/arch/mips/au1000/common/irq.c b/arch/mips/au1000/common/irq.c index b0ae1ab0ad9e..c00f308fd505 100644 --- a/arch/mips/au1000/common/irq.c +++ b/arch/mips/au1000/common/irq.c | |||
@@ -562,9 +562,9 @@ void __init arch_init_irq(void) | |||
562 | { | 562 | { |
563 | int i; | 563 | int i; |
564 | unsigned long cp0_status; | 564 | unsigned long cp0_status; |
565 | au1xxx_irq_map_t *imp; | 565 | struct au1xxx_irqmap *imp; |
566 | extern au1xxx_irq_map_t au1xxx_irq_map[]; | 566 | extern struct au1xxx_irqmap au1xxx_irq_map[]; |
567 | extern au1xxx_irq_map_t au1xxx_ic0_map[]; | 567 | extern struct au1xxx_irqmap au1xxx_ic0_map[]; |
568 | extern int au1xxx_nr_irqs; | 568 | extern int au1xxx_nr_irqs; |
569 | extern int au1xxx_ic0_nr_irqs; | 569 | extern int au1xxx_ic0_nr_irqs; |
570 | 570 | ||
diff --git a/arch/mips/au1000/db1x00/irqmap.c b/arch/mips/au1000/db1x00/irqmap.c index 3e5729145c2b..09cea03411b0 100644 --- a/arch/mips/au1000/db1x00/irqmap.c +++ b/arch/mips/au1000/db1x00/irqmap.c | |||
@@ -79,7 +79,7 @@ char irq_tab_alchemy[][5] __initdata = { | |||
79 | #endif | 79 | #endif |
80 | 80 | ||
81 | 81 | ||
82 | au1xxx_irq_map_t __initdata au1xxx_irq_map[] = { | 82 | struct au1xxx_irqmap __initdata au1xxx_irq_map[] = { |
83 | 83 | ||
84 | #ifndef CONFIG_MIPS_MIRAGE | 84 | #ifndef CONFIG_MIPS_MIRAGE |
85 | #ifdef CONFIG_MIPS_DB1550 | 85 | #ifdef CONFIG_MIPS_DB1550 |
diff --git a/arch/mips/au1000/mtx-1/irqmap.c b/arch/mips/au1000/mtx-1/irqmap.c index a4fa0f227e42..49c612aeddcf 100644 --- a/arch/mips/au1000/mtx-1/irqmap.c +++ b/arch/mips/au1000/mtx-1/irqmap.c | |||
@@ -58,7 +58,7 @@ char irq_tab_alchemy[][5] __initdata = { | |||
58 | [7] = { -1, INTD, INTC, INTX, INTX}, /* IDSEL 07 - AdapterD-Slot1 (bottom) */ | 58 | [7] = { -1, INTD, INTC, INTX, INTX}, /* IDSEL 07 - AdapterD-Slot1 (bottom) */ |
59 | }; | 59 | }; |
60 | 60 | ||
61 | au1xxx_irq_map_t __initdata au1xxx_irq_map[] = { | 61 | struct au1xxx_irqmap __initdata au1xxx_irq_map[] = { |
62 | { AU1500_GPIO_204, INTC_INT_HIGH_LEVEL, 0}, | 62 | { AU1500_GPIO_204, INTC_INT_HIGH_LEVEL, 0}, |
63 | { AU1500_GPIO_201, INTC_INT_LOW_LEVEL, 0 }, | 63 | { AU1500_GPIO_201, INTC_INT_LOW_LEVEL, 0 }, |
64 | { AU1500_GPIO_202, INTC_INT_LOW_LEVEL, 0 }, | 64 | { AU1500_GPIO_202, INTC_INT_LOW_LEVEL, 0 }, |
diff --git a/arch/mips/au1000/pb1000/irqmap.c b/arch/mips/au1000/pb1000/irqmap.c index 156500ba467f..88e354508204 100644 --- a/arch/mips/au1000/pb1000/irqmap.c +++ b/arch/mips/au1000/pb1000/irqmap.c | |||
@@ -47,7 +47,7 @@ | |||
47 | #include <asm/system.h> | 47 | #include <asm/system.h> |
48 | #include <asm/mach-au1x00/au1000.h> | 48 | #include <asm/mach-au1x00/au1000.h> |
49 | 49 | ||
50 | au1xxx_irq_map_t __initdata au1xxx_irq_map[] = { | 50 | struct au1xxx_irqmap __initdata au1xxx_irq_map[] = { |
51 | { AU1000_GPIO_15, INTC_INT_LOW_LEVEL, 0 }, | 51 | { AU1000_GPIO_15, INTC_INT_LOW_LEVEL, 0 }, |
52 | }; | 52 | }; |
53 | 53 | ||
diff --git a/arch/mips/au1000/pb1100/irqmap.c b/arch/mips/au1000/pb1100/irqmap.c index d986916221b7..880456bf8c11 100644 --- a/arch/mips/au1000/pb1100/irqmap.c +++ b/arch/mips/au1000/pb1100/irqmap.c | |||
@@ -47,7 +47,7 @@ | |||
47 | #include <asm/system.h> | 47 | #include <asm/system.h> |
48 | #include <asm/mach-au1x00/au1000.h> | 48 | #include <asm/mach-au1x00/au1000.h> |
49 | 49 | ||
50 | au1xxx_irq_map_t __initdata au1xxx_irq_map[] = { | 50 | struct au1xxx_irqmap __initdata au1xxx_irq_map[] = { |
51 | { AU1000_GPIO_9, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card Fully_Interted# | 51 | { AU1000_GPIO_9, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card Fully_Interted# |
52 | { AU1000_GPIO_10, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card STSCHG# | 52 | { AU1000_GPIO_10, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card STSCHG# |
53 | { AU1000_GPIO_11, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card IRQ# | 53 | { AU1000_GPIO_11, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card IRQ# |
diff --git a/arch/mips/au1000/pb1200/irqmap.c b/arch/mips/au1000/pb1200/irqmap.c index aa85eedf7c0d..3bee274445f5 100644 --- a/arch/mips/au1000/pb1200/irqmap.c +++ b/arch/mips/au1000/pb1200/irqmap.c | |||
@@ -54,7 +54,7 @@ | |||
54 | #define PB1200_INT_END DB1200_INT_END | 54 | #define PB1200_INT_END DB1200_INT_END |
55 | #endif | 55 | #endif |
56 | 56 | ||
57 | au1xxx_irq_map_t __initdata au1xxx_irq_map[] = { | 57 | struct au1xxx_irqmap __initdata au1xxx_irq_map[] = { |
58 | { AU1000_GPIO_7, INTC_INT_LOW_LEVEL, 0 }, // This is exteranl interrupt cascade | 58 | { AU1000_GPIO_7, INTC_INT_LOW_LEVEL, 0 }, // This is exteranl interrupt cascade |
59 | }; | 59 | }; |
60 | 60 | ||
diff --git a/arch/mips/au1000/pb1500/irqmap.c b/arch/mips/au1000/pb1500/irqmap.c index 409d1612bb63..810f695e24bb 100644 --- a/arch/mips/au1000/pb1500/irqmap.c +++ b/arch/mips/au1000/pb1500/irqmap.c | |||
@@ -52,7 +52,7 @@ char irq_tab_alchemy[][5] __initdata = { | |||
52 | [13] = { -1, INTA, INTB, INTC, INTD}, /* IDSEL 13 - PCI slot */ | 52 | [13] = { -1, INTA, INTB, INTC, INTD}, /* IDSEL 13 - PCI slot */ |
53 | }; | 53 | }; |
54 | 54 | ||
55 | au1xxx_irq_map_t __initdata au1xxx_irq_map[] = { | 55 | struct au1xxx_irqmap __initdata au1xxx_irq_map[] = { |
56 | { AU1500_GPIO_204, INTC_INT_HIGH_LEVEL, 0}, | 56 | { AU1500_GPIO_204, INTC_INT_HIGH_LEVEL, 0}, |
57 | { AU1500_GPIO_201, INTC_INT_LOW_LEVEL, 0 }, | 57 | { AU1500_GPIO_201, INTC_INT_LOW_LEVEL, 0 }, |
58 | { AU1500_GPIO_202, INTC_INT_LOW_LEVEL, 0 }, | 58 | { AU1500_GPIO_202, INTC_INT_LOW_LEVEL, 0 }, |
diff --git a/arch/mips/au1000/pb1550/irqmap.c b/arch/mips/au1000/pb1550/irqmap.c index 24a9d186cf5a..56becab28e5d 100644 --- a/arch/mips/au1000/pb1550/irqmap.c +++ b/arch/mips/au1000/pb1550/irqmap.c | |||
@@ -52,7 +52,7 @@ char irq_tab_alchemy[][5] __initdata = { | |||
52 | [13] = { -1, INTA, INTB, INTC, INTD}, /* IDSEL 13 - PCI slot 1 (right) */ | 52 | [13] = { -1, INTA, INTB, INTC, INTD}, /* IDSEL 13 - PCI slot 1 (right) */ |
53 | }; | 53 | }; |
54 | 54 | ||
55 | au1xxx_irq_map_t __initdata au1xxx_irq_map[] = { | 55 | struct au1xxx_irqmap __initdata au1xxx_irq_map[] = { |
56 | { AU1000_GPIO_0, INTC_INT_LOW_LEVEL, 0 }, | 56 | { AU1000_GPIO_0, INTC_INT_LOW_LEVEL, 0 }, |
57 | { AU1000_GPIO_1, INTC_INT_LOW_LEVEL, 0 }, | 57 | { AU1000_GPIO_1, INTC_INT_LOW_LEVEL, 0 }, |
58 | }; | 58 | }; |
diff --git a/arch/mips/au1000/xxs1500/irqmap.c b/arch/mips/au1000/xxs1500/irqmap.c index 3844c6429e27..389349295d70 100644 --- a/arch/mips/au1000/xxs1500/irqmap.c +++ b/arch/mips/au1000/xxs1500/irqmap.c | |||
@@ -47,7 +47,7 @@ | |||
47 | #include <asm/system.h> | 47 | #include <asm/system.h> |
48 | #include <asm/au1000.h> | 48 | #include <asm/au1000.h> |
49 | 49 | ||
50 | au1xxx_irq_map_t __initdata au1xxx_irq_map[] = { | 50 | struct au1xxx_irqmap __initdata au1xxx_irq_map[] = { |
51 | { AU1500_GPIO_204, INTC_INT_HIGH_LEVEL, 0}, | 51 | { AU1500_GPIO_204, INTC_INT_HIGH_LEVEL, 0}, |
52 | { AU1500_GPIO_201, INTC_INT_LOW_LEVEL, 0 }, | 52 | { AU1500_GPIO_201, INTC_INT_LOW_LEVEL, 0 }, |
53 | { AU1500_GPIO_202, INTC_INT_LOW_LEVEL, 0 }, | 53 | { AU1500_GPIO_202, INTC_INT_LOW_LEVEL, 0 }, |
diff --git a/include/asm-mips/mach-au1x00/au1000.h b/include/asm-mips/mach-au1x00/au1000.h index 630138f6f918..b37baf8cf624 100644 --- a/include/asm-mips/mach-au1x00/au1000.h +++ b/include/asm-mips/mach-au1x00/au1000.h | |||
@@ -102,16 +102,16 @@ extern unsigned int get_au1x00_lcd_clock(void); | |||
102 | /* | 102 | /* |
103 | * Every board describes its IRQ mapping with this table. | 103 | * Every board describes its IRQ mapping with this table. |
104 | */ | 104 | */ |
105 | typedef struct au1xxx_irqmap { | 105 | struct au1xxx_irqmap { |
106 | int im_irq; | 106 | int im_irq; |
107 | int im_type; | 107 | int im_type; |
108 | int im_request; | 108 | int im_request; |
109 | } au1xxx_irq_map_t; | 109 | }; |
110 | 110 | ||
111 | /* | 111 | /* |
112 | * init_IRQ looks for a table with this name. | 112 | * init_IRQ looks for a table with this name. |
113 | */ | 113 | */ |
114 | extern au1xxx_irq_map_t au1xxx_irq_map[]; | 114 | extern struct au1xxx_irqmap au1xxx_irq_map[]; |
115 | 115 | ||
116 | #endif /* !defined (_LANGUAGE_ASSEMBLY) */ | 116 | #endif /* !defined (_LANGUAGE_ASSEMBLY) */ |
117 | 117 | ||