lkml.org 
[lkml]   [2008]   [Oct]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 85/85] panasonic-laptop: fix build
    From: Len Brown <len.brown@intel.com>

    sync with acpi_driver_data(device)
    and acpi_evaluate_integer(..., long long)
    changes that happened since this driver
    was checked in.

    Signed-off-by: Len Brown <len.brown@intel.com>
    ---
    drivers/misc/panasonic-laptop.c | 6 +++---
    1 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/misc/panasonic-laptop.c b/drivers/misc/panasonic-laptop.c
    index 9aecda5..a2cb598 100644
    --- a/drivers/misc/panasonic-laptop.c
    +++ b/drivers/misc/panasonic-laptop.c
    @@ -252,7 +252,7 @@ static int acpi_pcc_write_sset(struct pcc_acpi *pcc, int func, int val)

    static inline int acpi_pcc_get_sqty(struct acpi_device *device)
    {
    - unsigned long s;
    + unsigned long long s;
    acpi_status status;

    ACPI_FUNCTION_TRACE("acpi_pcc_get_sqty");
    @@ -500,7 +500,7 @@ static void acpi_pcc_generate_keyinput(struct pcc_acpi *pcc)
    struct input_dev *hotk_input_dev = pcc->input_dev;
    int rc;
    int key_code, hkey_num;
    - unsigned long result;
    + unsigned long long result;

    ACPI_FUNCTION_TRACE("acpi_pcc_generate_keyinput");

    @@ -645,7 +645,7 @@ static int acpi_pcc_hotkey_add(struct acpi_device *device)
    pcc->device = device;
    pcc->handle = device->handle;
    pcc->num_sifr = num_sifr;
    - acpi_driver_data(device) = pcc;
    + device->driver_data = pcc;
    strcpy(acpi_device_name(device), ACPI_PCC_DEVICE_NAME);
    strcpy(acpi_device_class(device), ACPI_PCC_CLASS);

    --
    1.5.5.1


    \
     
     \ /
      Last update: 2008-10-15 04:39    [W:0.021 / U:30.072 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site