diff options
author | Andi Kleen <ak@linux.intel.com> | 2012-10-04 20:11:35 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-05 14:04:39 -0400 |
commit | 3cf5ae6e64507541ce00893e6459da3ef3d4fd6b (patch) | |
tree | 4cb0d29301b7f9916a432ae6b4baa0d120032e20 /arch/mips/pci | |
parent | dd47a8bd6e43e3112ea0fa89994b91c433d130c2 (diff) |
sections: fix section conflicts in arch/mips
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/mips/pci')
-rw-r--r-- | arch/mips/pci/pci-octeon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/pci/pci-octeon.c b/arch/mips/pci/pci-octeon.c index c5dfb2c87d44..4b0c347d7a82 100644 --- a/arch/mips/pci/pci-octeon.c +++ b/arch/mips/pci/pci-octeon.c | |||
@@ -58,7 +58,7 @@ union octeon_pci_address { | |||
58 | } s; | 58 | } s; |
59 | }; | 59 | }; |
60 | 60 | ||
61 | int __initdata (*octeon_pcibios_map_irq)(const struct pci_dev *dev, | 61 | int __initconst (*octeon_pcibios_map_irq)(const struct pci_dev *dev, |
62 | u8 slot, u8 pin); | 62 | u8 slot, u8 pin); |
63 | enum octeon_dma_bar_type octeon_dma_bar_type = OCTEON_DMA_BAR_TYPE_INVALID; | 63 | enum octeon_dma_bar_type octeon_dma_bar_type = OCTEON_DMA_BAR_TYPE_INVALID; |
64 | 64 | ||