Commit 3cf5ae6e authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds

sections: fix section conflicts in arch/mips

Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent dd47a8bd
...@@ -632,7 +632,7 @@ static struct board_info __initdata board_DWVS0 = { ...@@ -632,7 +632,7 @@ static struct board_info __initdata board_DWVS0 = {
/* /*
* all boards * all boards
*/ */
static const struct board_info __initdata *bcm963xx_boards[] = { static const struct board_info __initconst *bcm963xx_boards[] = {
#ifdef CONFIG_BCM63XX_CPU_6328 #ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng, &board_96328avng,
#endif #endif
......
...@@ -58,7 +58,7 @@ union octeon_pci_address { ...@@ -58,7 +58,7 @@ union octeon_pci_address {
} s; } s;
}; };
int __initdata (*octeon_pcibios_map_irq)(const struct pci_dev *dev, int __initconst (*octeon_pcibios_map_irq)(const struct pci_dev *dev,
u8 slot, u8 pin); u8 slot, u8 pin);
enum octeon_dma_bar_type octeon_dma_bar_type = OCTEON_DMA_BAR_TYPE_INVALID; enum octeon_dma_bar_type octeon_dma_bar_type = OCTEON_DMA_BAR_TYPE_INVALID;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment