Attachment #57714 for bug #133440

View | Details | Raw Unified | Return to bug 133440
Collapse All | Expand All




    }
}

PMClose
xf86OSPMOpen(void)
{
	PMClose ret = NULL;

	/* Favour ACPI over APM */

/* Novell Bug #133440 / X.Org Bug #4718 / RH Bug #169766 */
#if 0
	ret = lnxACPIOpen();
#endif

	if (!ret)
		ret = lnxAPMOpen();

	return ret;
}

static PMClose
lnxAPMOpen(void)
{

Return to bug 133440

Lines 126-146 Link Here

(-)programs/Xserver/hw/xfree86/os-support/linux/lnx_apm.c (+3 lines)
126	}	126	}
127	}	127	}
128		128
129	PMClose	129	PMClose
130	xf86OSPMOpen(void)	130	xf86OSPMOpen(void)
131	{	131	{
132	PMClose ret = NULL;	132	PMClose ret = NULL;
133		133
134	/* Favour ACPI over APM */	134	/* Favour ACPI over APM */
135		135
		136	/* Novell Bug #133440 / X.Org Bug #4718 / RH Bug #169766 */
		137	#if 0
136	ret = lnxACPIOpen();	138	ret = lnxACPIOpen();
		139	#endif
137		140
138	if (!ret)	141	if (!ret)
139	ret = lnxAPMOpen();	142	ret = lnxAPMOpen();
140		143
141	return ret;	144	return ret;
142	}	145	}
143		146
144	static PMClose	147	static PMClose
145	lnxAPMOpen(void)	148	lnxAPMOpen(void)
146	{	149	{