From: Rafael J. Wysocki Date: Tue, 15 Feb 2011 20:22:24 +0000 (+0100) Subject: PM: Drop pm_flags that is not necessary X-Git-Tag: v2.6.39-rc1~484^2~8 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6831c6edc7b272a08dd2a6c71bb183a48fe98ae6;p=pandora-kernel.git PM: Drop pm_flags that is not necessary The variable pm_flags is used to prevent APM from being enabled along with ACPI, which would lead to problems. However, acpi_init() is always called before apm_init() and after acpi_init() has returned, it is known whether or not ACPI will be used. Namely, if acpi_disabled is not set after acpi_init() has returned, this means that ACPI is enabled. Thus, it is sufficient to check acpi_disabled in apm_init() to prevent APM from being enabled in parallel with ACPI. Signed-off-by: Rafael J. Wysocki Acked-by: Len Brown --- Reading git-diff-tree failed