lkml.org 
[lkml]   [2012]   [Aug]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 03/31] sections: Fix section conflicts in arch/frv
    Date
    From: Andi Kleen <ak@linux.intel.com>

    Signed-off-by: Andi Kleen <ak@linux.intel.com>
    ---
    arch/frv/kernel/setup.c | 2 +-
    arch/frv/mb93090-mb00/pci-irq.c | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/arch/frv/kernel/setup.c b/arch/frv/kernel/setup.c
    index 75cf7f4..1f1e5ef 100644
    --- a/arch/frv/kernel/setup.c
    +++ b/arch/frv/kernel/setup.c
    @@ -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 = {
    diff --git a/arch/frv/mb93090-mb00/pci-irq.c b/arch/frv/mb93090-mb00/pci-irq.c
    index 20f6497..c677b9d 100644
    --- a/arch/frv/mb93090-mb00/pci-irq.c
    +++ b/arch/frv/mb93090-mb00/pci-irq.c
    @@ -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 },
    --
    1.7.7.6


    \
     
     \ /
      Last update: 2012-08-18 20:01    [W:0.020 / U:60.860 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site