diff options
Diffstat (limited to 'arch/mips/sni')
-rw-r--r-- | arch/mips/sni/pcimt.c | 2 | ||||
-rw-r--r-- | arch/mips/sni/pcit.c | 16 |
2 files changed, 11 insertions, 7 deletions
diff --git a/arch/mips/sni/pcimt.c b/arch/mips/sni/pcimt.c index cec4b8ca1438..12336c2a649c 100644 --- a/arch/mips/sni/pcimt.c +++ b/arch/mips/sni/pcimt.c | |||
@@ -185,6 +185,7 @@ static void __init sni_pcimt_resource_init(void) | |||
185 | 185 | ||
186 | extern struct pci_ops sni_pcimt_ops; | 186 | extern struct pci_ops sni_pcimt_ops; |
187 | 187 | ||
188 | #ifdef CONFIG_PCI | ||
188 | static struct pci_controller sni_controller = { | 189 | static struct pci_controller sni_controller = { |
189 | .pci_ops = &sni_pcimt_ops, | 190 | .pci_ops = &sni_pcimt_ops, |
190 | .mem_resource = &sni_mem_resource, | 191 | .mem_resource = &sni_mem_resource, |
@@ -193,6 +194,7 @@ static struct pci_controller sni_controller = { | |||
193 | .io_offset = 0x00000000UL, | 194 | .io_offset = 0x00000000UL, |
194 | .io_map_base = SNI_PORT_BASE | 195 | .io_map_base = SNI_PORT_BASE |
195 | }; | 196 | }; |
197 | #endif | ||
196 | 198 | ||
197 | static void enable_pcimt_irq(struct irq_data *d) | 199 | static void enable_pcimt_irq(struct irq_data *d) |
198 | { | 200 | { |
diff --git a/arch/mips/sni/pcit.c b/arch/mips/sni/pcit.c index 7cddd03d1fea..05bb51676e82 100644 --- a/arch/mips/sni/pcit.c +++ b/arch/mips/sni/pcit.c | |||
@@ -128,13 +128,6 @@ static struct resource pcit_io_resources[] = { | |||
128 | } | 128 | } |
129 | }; | 129 | }; |
130 | 130 | ||
131 | static struct resource sni_mem_resource = { | ||
132 | .start = 0x18000000UL, | ||
133 | .end = 0x1fbfffffUL, | ||
134 | .name = "PCIT PCI MEM", | ||
135 | .flags = IORESOURCE_MEM | ||
136 | }; | ||
137 | |||
138 | static void __init sni_pcit_resource_init(void) | 131 | static void __init sni_pcit_resource_init(void) |
139 | { | 132 | { |
140 | int i; | 133 | int i; |
@@ -147,6 +140,14 @@ static void __init sni_pcit_resource_init(void) | |||
147 | 140 | ||
148 | extern struct pci_ops sni_pcit_ops; | 141 | extern struct pci_ops sni_pcit_ops; |
149 | 142 | ||
143 | #ifdef CONFIG_PCI | ||
144 | static struct resource sni_mem_resource = { | ||
145 | .start = 0x18000000UL, | ||
146 | .end = 0x1fbfffffUL, | ||
147 | .name = "PCIT PCI MEM", | ||
148 | .flags = IORESOURCE_MEM | ||
149 | }; | ||
150 | |||
150 | static struct pci_controller sni_pcit_controller = { | 151 | static struct pci_controller sni_pcit_controller = { |
151 | .pci_ops = &sni_pcit_ops, | 152 | .pci_ops = &sni_pcit_ops, |
152 | .mem_resource = &sni_mem_resource, | 153 | .mem_resource = &sni_mem_resource, |
@@ -155,6 +156,7 @@ static struct pci_controller sni_pcit_controller = { | |||
155 | .io_offset = 0x00000000UL, | 156 | .io_offset = 0x00000000UL, |
156 | .io_map_base = SNI_PORT_BASE | 157 | .io_map_base = SNI_PORT_BASE |
157 | }; | 158 | }; |
159 | #endif /* CONFIG_PCI */ | ||
158 | 160 | ||
159 | static void enable_pcit_irq(struct irq_data *d) | 161 | static void enable_pcit_irq(struct irq_data *d) |
160 | { | 162 | { |