diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | 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 562fcf0dd2b5..7693e89459f0 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c | |||
@@ -535,15 +535,6 @@ TPACPI_HANDLE(hkey, ec, "\\_SB.HKEY", /* 600e/x, 770e, 770x */ | |||
535 | "HKEY", /* all others */ | 535 | "HKEY", /* all others */ |
536 | ); /* 570 */ | 536 | ); /* 570 */ |
537 | 537 | ||
538 | TPACPI_HANDLE(vid, root, "\\_SB.PCI.AGP.VGA", /* 570 */ | ||
539 | "\\_SB.PCI0.AGP0.VID0", /* 600e/x, 770x */ | ||
540 | "\\_SB.PCI0.VID0", /* 770e */ | ||
541 | "\\_SB.PCI0.VID", /* A21e, G4x, R50e, X30, X40 */ | ||
542 | "\\_SB.PCI0.AGP.VGA", /* X100e and a few others */ | ||
543 | "\\_SB.PCI0.AGP.VID", /* all others */ | ||
544 | ); /* R30, R31 */ | ||
545 | |||
546 | |||
547 | /************************************************************************* | 538 | /************************************************************************* |
548 | * ACPI helpers | 539 | * ACPI helpers |
549 | */ | 540 | */ |
@@ -4444,6 +4435,15 @@ static int video_orig_autosw; | |||
4444 | static int video_autosw_get(void); | 4435 | static int video_autosw_get(void); |
4445 | static int video_autosw_set(int enable); | 4436 | static int video_autosw_set(int enable); |
4446 | 4437 | ||
4438 | TPACPI_HANDLE(vid, root, | ||
4439 | "\\_SB.PCI.AGP.VGA", /* 570 */ | ||
4440 | "\\_SB.PCI0.AGP0.VID0", /* 600e/x, 770x */ | ||
4441 | "\\_SB.PCI0.VID0", /* 770e */ | ||
4442 | "\\_SB.PCI0.VID", /* A21e, G4x, R50e, X30, X40 */ | ||
4443 | "\\_SB.PCI0.AGP.VGA", /* X100e and a few others */ | ||
4444 | "\\_SB.PCI0.AGP.VID", /* all others */ | ||
4445 | ); /* R30, R31 */ | ||
4446 | |||
4447 | TPACPI_HANDLE(vid2, root, "\\_SB.PCI0.AGPB.VID"); /* G41 */ | 4447 | TPACPI_HANDLE(vid2, root, "\\_SB.PCI0.AGPB.VID"); /* G41 */ |
4448 | 4448 | ||
4449 | static int __init video_init(struct ibm_init_struct *iibm) | 4449 | static int __init video_init(struct ibm_init_struct *iibm) |