thinkpad_acpi: Correct !CONFIG_THINKPAD_ACPI_VIDEO warning
Move TPACPI_HANDLE declaration into #ifdef block and neaten it a bit. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
This commit is contained in:
parent
253a0069d7
commit
112a6ee053
|
@ -535,15 +535,6 @@ TPACPI_HANDLE(hkey, ec, "\\_SB.HKEY", /* 600e/x, 770e, 770x */
|
||||||
"HKEY", /* all others */
|
"HKEY", /* all others */
|
||||||
); /* 570 */
|
); /* 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
|
* ACPI helpers
|
||||||
*/
|
*/
|
||||||
|
@ -4444,6 +4435,15 @@ static int video_orig_autosw;
|
||||||
static int video_autosw_get(void);
|
static int video_autosw_get(void);
|
||||||
static int video_autosw_set(int enable);
|
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 */
|
TPACPI_HANDLE(vid2, root, "\\_SB.PCI0.AGPB.VID"); /* G41 */
|
||||||
|
|
||||||
static int __init video_init(struct ibm_init_struct *iibm)
|
static int __init video_init(struct ibm_init_struct *iibm)
|
||||||
|
|
Loading…
Reference in a new issue