diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2013-06-25 11:10:28 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2013-06-25 11:10:28 -0400 |
commit | 6a72015d3c3602dd969e79510486807c481a0e1b (patch) | |
tree | 9479c0221b8fc757f11da0171b551697c39a23e3 /arch/mips | |
parent | 5bd807659bfd5d5a393b2269dc3e9699dddd9ad6 (diff) |
MIPS: SNI: pcit: Fix build error with CONFIG_PCI=n disabled.
CC arch/mips/sni/pcit.o
arch/mips/sni/pcit.c:150:30: warning: ‘sni_pcit_controller’ defined but not used [-Wunused-variable]
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/sni/pcit.c | 16 |
1 files changed, 9 insertions, 7 deletions
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 | { |