lkml.org 
[lkml]   [2011]   [Apr]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/2] thinkpad_acpi: Correct !CONFIG_THINKPAD_ACPI_VIDEO warning
    Date
    Move TPACPI_HANDLE declaration into #ifdef block
    and neaten it a bit.

    Signed-off-by: Joe Perches <joe@perches.com>
    ---
    drivers/platform/x86/thinkpad_acpi.c | 18 +++++++++---------
    1 files changed, 9 insertions(+), 9 deletions(-)

    diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
    index a08561f..2eaecd4 100644
    --- a/drivers/platform/x86/thinkpad_acpi.c
    +++ b/drivers/platform/x86/thinkpad_acpi.c
    @@ -534,15 +534,6 @@ TPACPI_HANDLE(hkey, ec, "\\_SB.HKEY", /* 600e/x, 770e, 770x */
    "HKEY", /* all others */
    ); /* 570 */

    -TPACPI_HANDLE(vid, root, "\\_SB.PCI.AGP.VGA", /* 570 */
    - "\\_SB.PCI0.AGP0.VID0", /* 600e/x, 770x */
    - "\\_SB.PCI0.VID0", /* 770e */
    - "\\_SB.PCI0.VID", /* A21e, G4x, R50e, X30, X40 */
    - "\\_SB.PCI0.AGP.VGA", /* X100e and a few others */
    - "\\_SB.PCI0.AGP.VID", /* all others */
    - ); /* R30, R31 */
    -
    -
    /*************************************************************************
    * ACPI helpers
    */
    @@ -4442,6 +4433,15 @@ static int video_orig_autosw;
    static int video_autosw_get(void);
    static int video_autosw_set(int enable);

    +TPACPI_HANDLE(vid, root,
    + "\\_SB.PCI.AGP.VGA", /* 570 */
    + "\\_SB.PCI0.AGP0.VID0", /* 600e/x, 770x */
    + "\\_SB.PCI0.VID0", /* 770e */
    + "\\_SB.PCI0.VID", /* A21e, G4x, R50e, X30, X40 */
    + "\\_SB.PCI0.AGP.VGA", /* X100e and a few others */
    + "\\_SB.PCI0.AGP.VID", /* all others */
    + ); /* R30, R31 */
    +
    TPACPI_HANDLE(vid2, root, "\\_SB.PCI0.AGPB.VID"); /* G41 */

    static int __init video_init(struct ibm_init_struct *iibm)
    --
    1.7.4.2.g597a6.dirty


    \
     
     \ /
      Last update: 2011-04-04 19:09    [W:0.020 / U:1.340 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site