diff options
Diffstat (limited to 'arch/arm/mach-iop32x')
-rw-r--r-- | arch/arm/mach-iop32x/em7210.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/glantank.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/hardware.h | 3 | ||||
-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/n2100.c | 2 |
6 files changed, 6 insertions, 9 deletions
diff --git a/arch/arm/mach-iop32x/em7210.c b/arch/arm/mach-iop32x/em7210.c index 779f924af302..6cbffbfc2bba 100644 --- a/arch/arm/mach-iop32x/em7210.c +++ b/arch/arm/mach-iop32x/em7210.c | |||
@@ -81,7 +81,7 @@ void __init em7210_map_io(void) | |||
81 | #define INTD IRQ_IOP32X_XINT3 | 81 | #define INTD IRQ_IOP32X_XINT3 |
82 | 82 | ||
83 | static int __init | 83 | static int __init |
84 | em7210_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 84 | em7210_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
85 | { | 85 | { |
86 | static int pci_irq_table[][4] = { | 86 | static int pci_irq_table[][4] = { |
87 | /* | 87 | /* |
diff --git a/arch/arm/mach-iop32x/glantank.c b/arch/arm/mach-iop32x/glantank.c index c6b6f9c5650d..ceef5d4dce1a 100644 --- a/arch/arm/mach-iop32x/glantank.c +++ b/arch/arm/mach-iop32x/glantank.c | |||
@@ -77,7 +77,7 @@ void __init glantank_map_io(void) | |||
77 | #define INTD IRQ_IOP32X_XINT3 | 77 | #define INTD IRQ_IOP32X_XINT3 |
78 | 78 | ||
79 | static int __init | 79 | static int __init |
80 | glantank_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 80 | glantank_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
81 | { | 81 | { |
82 | static int pci_irq_table[][4] = { | 82 | static int pci_irq_table[][4] = { |
83 | /* | 83 | /* |
diff --git a/arch/arm/mach-iop32x/include/mach/hardware.h b/arch/arm/mach-iop32x/include/mach/hardware.h index d559c4e6095a..48cb1b20ba91 100644 --- a/arch/arm/mach-iop32x/include/mach/hardware.h +++ b/arch/arm/mach-iop32x/include/mach/hardware.h | |||
@@ -18,9 +18,6 @@ | |||
18 | * but when we read them, we convert them to virtual addresses. See | 18 | * but when we read them, we convert them to virtual addresses. See |
19 | * arch/arm/plat-iop/pci.c. | 19 | * arch/arm/plat-iop/pci.c. |
20 | */ | 20 | */ |
21 | #define pcibios_assign_all_busses() 1 | ||
22 | #define PCIBIOS_MIN_IO 0x00000000 | ||
23 | #define PCIBIOS_MIN_MEM 0x00000000 | ||
24 | 21 | ||
25 | #ifndef __ASSEMBLY__ | 22 | #ifndef __ASSEMBLY__ |
26 | void iop32x_init_irq(void); | 23 | void iop32x_init_irq(void); |
diff --git a/arch/arm/mach-iop32x/iq31244.c b/arch/arm/mach-iop32x/iq31244.c index fde962c057f0..3a62514dae7c 100644 --- a/arch/arm/mach-iop32x/iq31244.c +++ b/arch/arm/mach-iop32x/iq31244.c | |||
@@ -103,7 +103,7 @@ void __init iq31244_map_io(void) | |||
103 | * EP80219/IQ31244 PCI. | 103 | * EP80219/IQ31244 PCI. |
104 | */ | 104 | */ |
105 | static int __init | 105 | static int __init |
106 | ep80219_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 106 | ep80219_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
107 | { | 107 | { |
108 | int irq; | 108 | int irq; |
109 | 109 | ||
@@ -139,7 +139,7 @@ static struct hw_pci ep80219_pci __initdata = { | |||
139 | }; | 139 | }; |
140 | 140 | ||
141 | static int __init | 141 | static int __init |
142 | iq31244_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 142 | iq31244_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
143 | { | 143 | { |
144 | int irq; | 144 | int irq; |
145 | 145 | ||
diff --git a/arch/arm/mach-iop32x/iq80321.c b/arch/arm/mach-iop32x/iq80321.c index 3a95950e8737..35b7e6914d3b 100644 --- a/arch/arm/mach-iop32x/iq80321.c +++ b/arch/arm/mach-iop32x/iq80321.c | |||
@@ -71,7 +71,7 @@ void __init iq80321_map_io(void) | |||
71 | * IQ80321 PCI. | 71 | * IQ80321 PCI. |
72 | */ | 72 | */ |
73 | static int __init | 73 | static int __init |
74 | iq80321_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 74 | iq80321_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
75 | { | 75 | { |
76 | int irq; | 76 | int irq; |
77 | 77 | ||
diff --git a/arch/arm/mach-iop32x/n2100.c b/arch/arm/mach-iop32x/n2100.c index 626aa375915d..1a374eab6007 100644 --- a/arch/arm/mach-iop32x/n2100.c +++ b/arch/arm/mach-iop32x/n2100.c | |||
@@ -78,7 +78,7 @@ void __init n2100_map_io(void) | |||
78 | * N2100 PCI. | 78 | * N2100 PCI. |
79 | */ | 79 | */ |
80 | static int __init | 80 | static int __init |
81 | n2100_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 81 | n2100_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
82 | { | 82 | { |
83 | int irq; | 83 | int irq; |
84 | 84 | ||