if we have apm as well on a new kernel - use that as it will probably take

preference to power_supply class stuff


SVN revision: 34390
This commit is contained in:
Carsten Haitzler 2008-04-28 11:12:25 +00:00
parent b1c69d3f5f
commit c71bc63e7e
1 changed files with 2 additions and 1 deletions

View File

@ -1348,7 +1348,8 @@ init(void)
#elif defined(HAVE_CFBASE_H) /* OS X */
darwin_init();
#else
if (ecore_file_is_dir("/sys/class/power_supply")) /* >= 2.6.24 */
if ((ecore_file_is_dir("/sys/class/power_supply")) &&
(!ecore_file_exists("/proc/apm"))) /* >= 2.6.24 */
{
mode = CHECK_SYS_CLASS_POWER_SUPPLY;
linux_sys_class_power_supply_init();