Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

sections: fix section conflicts in arch/frv

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Andi Kleen 12 years ago
parent
bcad6dc363
commit
3f3247d019
2 changed files with 2 additions and 2 deletions
Split View Show Diff Stats
  1. 1 1
      arch/frv/kernel/setup.c
  2. 1 1
      arch/frv/mb93090-mb00/pci-irq.c

+ 1 - 1
arch/frv/kernel/setup.c
View File 

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

+ 1 - 1
arch/frv/mb93090-mb00/pci-irq.c
View File 

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