diff options
Diffstat (limited to 'arch/arm/mach-iop32x')
-rw-r--r-- | arch/arm/mach-iop32x/glantank.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/iq31244.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/iq80321.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/irq.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/n2100.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-iop32x/glantank.c b/arch/arm/mach-iop32x/glantank.c index 45f4f13ae11b..5776fd884115 100644 --- a/arch/arm/mach-iop32x/glantank.c +++ b/arch/arm/mach-iop32x/glantank.c | |||
@@ -75,7 +75,7 @@ void __init glantank_map_io(void) | |||
75 | #define INTC IRQ_IOP32X_XINT2 | 75 | #define INTC IRQ_IOP32X_XINT2 |
76 | #define INTD IRQ_IOP32X_XINT3 | 76 | #define INTD IRQ_IOP32X_XINT3 |
77 | 77 | ||
78 | static inline int __init | 78 | static int __init |
79 | glantank_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 79 | glantank_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) |
80 | { | 80 | { |
81 | static int pci_irq_table[][4] = { | 81 | static int pci_irq_table[][4] = { |
diff --git a/arch/arm/mach-iop32x/iq31244.c b/arch/arm/mach-iop32x/iq31244.c index 7b21c6e13e59..d4eefbea1fe6 100644 --- a/arch/arm/mach-iop32x/iq31244.c +++ b/arch/arm/mach-iop32x/iq31244.c | |||
@@ -104,7 +104,7 @@ void __init iq31244_map_io(void) | |||
104 | /* | 104 | /* |
105 | * EP80219/IQ31244 PCI. | 105 | * EP80219/IQ31244 PCI. |
106 | */ | 106 | */ |
107 | static inline int __init | 107 | static int __init |
108 | ep80219_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 108 | ep80219_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) |
109 | { | 109 | { |
110 | int irq; | 110 | int irq; |
@@ -140,7 +140,7 @@ static struct hw_pci ep80219_pci __initdata = { | |||
140 | .map_irq = ep80219_pci_map_irq, | 140 | .map_irq = ep80219_pci_map_irq, |
141 | }; | 141 | }; |
142 | 142 | ||
143 | static inline int __init | 143 | static int __init |
144 | iq31244_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 144 | iq31244_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) |
145 | { | 145 | { |
146 | int irq; | 146 | int irq; |
diff --git a/arch/arm/mach-iop32x/iq80321.c b/arch/arm/mach-iop32x/iq80321.c index bc25fb91e7b9..8d9f49164a84 100644 --- a/arch/arm/mach-iop32x/iq80321.c +++ b/arch/arm/mach-iop32x/iq80321.c | |||
@@ -72,7 +72,7 @@ void __init iq80321_map_io(void) | |||
72 | /* | 72 | /* |
73 | * IQ80321 PCI. | 73 | * IQ80321 PCI. |
74 | */ | 74 | */ |
75 | static inline int __init | 75 | static int __init |
76 | iq80321_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 76 | iq80321_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) |
77 | { | 77 | { |
78 | int irq; | 78 | int irq; |
diff --git a/arch/arm/mach-iop32x/irq.c b/arch/arm/mach-iop32x/irq.c index 82598dc18d80..c971171c2905 100644 --- a/arch/arm/mach-iop32x/irq.c +++ b/arch/arm/mach-iop32x/irq.c | |||
@@ -21,12 +21,12 @@ | |||
21 | 21 | ||
22 | static u32 iop32x_mask; | 22 | static u32 iop32x_mask; |
23 | 23 | ||
24 | static inline void intctl_write(u32 val) | 24 | static void intctl_write(u32 val) |
25 | { | 25 | { |
26 | asm volatile("mcr p6, 0, %0, c0, c0, 0" : : "r" (val)); | 26 | asm volatile("mcr p6, 0, %0, c0, c0, 0" : : "r" (val)); |
27 | } | 27 | } |
28 | 28 | ||
29 | static inline void intstr_write(u32 val) | 29 | static void intstr_write(u32 val) |
30 | { | 30 | { |
31 | asm volatile("mcr p6, 0, %0, c4, c0, 0" : : "r" (val)); | 31 | asm volatile("mcr p6, 0, %0, c4, c0, 0" : : "r" (val)); |
32 | } | 32 | } |
diff --git a/arch/arm/mach-iop32x/n2100.c b/arch/arm/mach-iop32x/n2100.c index 5f07344d96f3..d55005d64781 100644 --- a/arch/arm/mach-iop32x/n2100.c +++ b/arch/arm/mach-iop32x/n2100.c | |||
@@ -76,7 +76,7 @@ void __init n2100_map_io(void) | |||
76 | /* | 76 | /* |
77 | * N2100 PCI. | 77 | * N2100 PCI. |
78 | */ | 78 | */ |
79 | static inline int __init | 79 | static int __init |
80 | n2100_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 80 | n2100_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) |
81 | { | 81 | { |
82 | int irq; | 82 | int irq; |