Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 330031
b: refs/heads/master
c: 3f3247d
h: refs/heads/master
i:
  330029: 924a5d2
  330027: 6d5524f
  330023: 55e15f7
  330015: b35a690
v: v3
  • Loading branch information
Andi Kleen authored and Linus Torvalds committed Oct 5, 2012
1 parent 71b636d commit a82483b
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bcad6dc3634a861c8c5e1f7261c02646a9010014
refs/heads/master: 3f3247d01933d357229f6a11f62d88a848445a9a
2 changes: 1 addition & 1 deletion trunk/arch/frv/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/frv/mb93090-mb00/pci-irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down

0 comments on commit a82483b

Please sign in to comment.