diff options
| author |   Andi Kleen <ak@linux.intel.com> | 2012-10-04 17:11:35 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-06 03:04:39 +0900 |
| commit | 3cf5ae6e64507541ce00893e6459da3ef3d4fd6b (patch) | |
| tree | 4cb0d29301b7f9916a432ae6b4baa0d120032e20 /arch | |
| parent | sections: fix section conflicts in arch/ia64 (diff) | |
| download | linux-dev-3cf5ae6e64507541ce00893e6459da3ef3d4fd6b.tar.xz linux-dev-3cf5ae6e64507541ce00893e6459da3ef3d4fd6b.zip | |
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')
| -rw-r--r-- | arch/mips/bcm63xx/boards/board_bcm963xx.c | 2 | ||||
| -rw-r--r-- | arch/mips/pci/pci-octeon.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/bcm63xx/boards/board_bcm963xx.c b/arch/mips/bcm63xx/boards/board_bcm963xx.c index feb05258a4d1..dd18e4b761a8 100644 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c @@ -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 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 { } 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; |