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 24/31] sections: Fix section conflicts in drivers/platform/x86
    Date
    From: Andi Kleen <ak@linux.intel.com>

    Signed-off-by: Andi Kleen <ak@linux.intel.com>
    ---
    drivers/platform/x86/amilo-rfkill.c | 2 +-
    drivers/platform/x86/fujitsu-tablet.c | 10 +++++-----
    drivers/platform/x86/thinkpad_acpi.c | 2 +-
    3 files changed, 7 insertions(+), 7 deletions(-)

    diff --git a/drivers/platform/x86/amilo-rfkill.c b/drivers/platform/x86/amilo-rfkill.c
    index a514bf6..1deca7f 100644
    --- a/drivers/platform/x86/amilo-rfkill.c
    +++ b/drivers/platform/x86/amilo-rfkill.c
    @@ -74,7 +74,7 @@ static const struct rfkill_ops amilo_m7440_rfkill_ops = {
    .set_block = amilo_m7440_rfkill_set_block
    };

    -static const struct dmi_system_id __devinitdata amilo_rfkill_id_table[] = {
    +static const struct dmi_system_id __devinitconst amilo_rfkill_id_table[] = {
    {
    .matches = {
    DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
    diff --git a/drivers/platform/x86/fujitsu-tablet.c b/drivers/platform/x86/fujitsu-tablet.c
    index 7acae3f..f774845 100644
    --- a/drivers/platform/x86/fujitsu-tablet.c
    +++ b/drivers/platform/x86/fujitsu-tablet.c
    @@ -52,7 +52,7 @@ struct fujitsu_config {
    unsigned int quirks;
    };

    -static unsigned short keymap_Lifebook_Tseries[KEYMAP_LEN] __initconst = {
    +static unsigned short keymap_Lifebook_Tseries[KEYMAP_LEN] __initdata = {
    KEY_RESERVED,
    KEY_RESERVED,
    KEY_RESERVED,
    @@ -71,7 +71,7 @@ static unsigned short keymap_Lifebook_Tseries[KEYMAP_LEN] __initconst = {
    KEY_LEFTALT
    };

    -static unsigned short keymap_Lifebook_U810[KEYMAP_LEN] __initconst = {
    +static unsigned short keymap_Lifebook_U810[KEYMAP_LEN] __initdata = {
    KEY_RESERVED,
    KEY_RESERVED,
    KEY_RESERVED,
    @@ -90,7 +90,7 @@ static unsigned short keymap_Lifebook_U810[KEYMAP_LEN] __initconst = {
    KEY_LEFTALT
    };

    -static unsigned short keymap_Stylistic_Tseries[KEYMAP_LEN] __initconst = {
    +static unsigned short keymap_Stylistic_Tseries[KEYMAP_LEN] __initdata = {
    KEY_RESERVED,
    KEY_RESERVED,
    KEY_RESERVED,
    @@ -109,7 +109,7 @@ static unsigned short keymap_Stylistic_Tseries[KEYMAP_LEN] __initconst = {
    KEY_LEFTALT
    };

    -static unsigned short keymap_Stylistic_ST5xxx[KEYMAP_LEN] __initconst = {
    +static unsigned short keymap_Stylistic_ST5xxx[KEYMAP_LEN] __initdata = {
    KEY_RESERVED,
    KEY_RESERVED,
    KEY_RESERVED,
    @@ -299,7 +299,7 @@ static int __devinit fujitsu_dmi_stylistic(const struct dmi_system_id *dmi)
    return 1;
    }

    -static struct dmi_system_id dmi_ids[] __initconst = {
    +static const struct dmi_system_id dmi_ids[] __initconst = {
    {
    .callback = fujitsu_dmi_lifebook,
    .ident = "Fujitsu Siemens P/T Series",
    diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
    index f28f36c..b5528ce 100644
    --- a/drivers/platform/x86/thinkpad_acpi.c
    +++ b/drivers/platform/x86/thinkpad_acpi.c
    @@ -522,7 +522,7 @@ static acpi_handle ec_handle;

    #define TPACPI_HANDLE(object, parent, paths...) \
    static acpi_handle object##_handle; \
    - static const acpi_handle *object##_parent __initdata = \
    + static const acpi_handle * const object##_parent __initconst = \
    &parent##_handle; \
    static char *object##_paths[] __initdata = { paths }

    --
    1.7.7.6


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