evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sections: fix section conflicts in arch/mips

Browse source 
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>
This commit is contained in:
Andi Kleen 2012-10-04 17:11:35 -07:00 • committed by Linus Torvalds
parent dd47a8bd6e
commit 3cf5ae6e64
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/mips/bcm63xx/boards/board_bcm963xx.c
View file

@ -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

2
arch/mips/pci/pci-octeon.c
View file

@ -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;