]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
sections: fix section conflicts in arch/mips
authorAndi Kleen <ak@linux.intel.com>
Wed, 26 Sep 2012 01:34:03 +0000 (11:34 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 27 Sep 2012 07:27:15 +0000 (17:27 +1000)
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>
arch/mips/bcm63xx/boards/board_bcm963xx.c
arch/mips/pci/pci-octeon.c

index 814052b378cf9536de6fd9a88cb70a6f12b83bd9..91c13d96d693b11c9d2ec23a39064f08e073978d 100644 (file)
@@ -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
index c5dfb2c87d44d480d8a35708a13ae6dfa003b068..4b0c347d7a8241d1279a11efc84c873ee2a85650 100644 (file)
@@ -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;