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

sections: fix section conflicts in arch/frv 



Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent bcad6dc3

arch/frv/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ static struct clock_cmode __pminitdata clock_cmodes_fr555[16] = { 
	[6]	= {	_x1,	_x1_5,	_x1_5,	_x4_5,	_x0_375	},

};



static const struct clock_cmode __pminitdata *clock_cmodes;

static const struct clock_cmode __pminitconst *clock_cmodes;

static int __pminitdata clock_doubled;



static struct uart_port __pminitdata __frv_uart0 = {

arch/frv/mb93090-mb00/pci-irq.c

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
 *

 */



static const uint8_t __initdata pci_bus0_irq_routing[32][4] = {

static const uint8_t __initconst pci_bus0_irq_routing[32][4] = {

	[0 ] = { IRQ_FPGA_MB86943_PCI_INTA },

	[16] = { IRQ_FPGA_RTL8029_INTA },

	[17] = { IRQ_FPGA_PCI_INTC, IRQ_FPGA_PCI_INTD, IRQ_FPGA_PCI_INTA, IRQ_FPGA_PCI_INTB },