Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 112a6ee0 authored by Joe Perches's avatar Joe Perches Committed by Matthew Garrett
Browse files

thinkpad_acpi: Correct !CONFIG_THINKPAD_ACPI_VIDEO warning 



Move TPACPI_HANDLE declaration into #ifdef block
and neaten it a bit.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarMatthew Garrett <mjg@redhat.com>
parent 253a0069

drivers/platform/x86/thinkpad_acpi.c

+9 −9
Original line number Diff line number Diff line
@@ -535,15 +535,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

 */
@@ -4444,6 +4435,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)