Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/mips/bcm63xx/boards/board_bcm963xx.c

+1 −1
Original line number Diff line number Diff line
@@ -632,7 +632,7 @@ static struct board_info __initdata board_DWVS0 = { 
/*

 * all boards

 */

static const struct board_info __initdata *bcm963xx_boards[] = {

static const struct board_info __initconst *bcm963xx_boards[] = {

#ifdef CONFIG_BCM63XX_CPU_6328

	&board_96328avng,

#endif

arch/mips/pci/pci-octeon.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ union octeon_pci_address { 
	} 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);

enum octeon_dma_bar_type octeon_dma_bar_type = OCTEON_DMA_BAR_TYPE_INVALID;