diff options
| author | Len Brown | 2009-09-19 06:37:13 +0200 |
|---|---|---|
| committer | Len Brown | 2009-09-19 06:37:13 +0200 |
| commit | 003d6a38ce1a59e0053a02fd9e9a65b588bc8e33 (patch) | |
| tree | c9b941f4798a2accca200b0b01c07353ce5b07e1 /drivers/acpi/blacklist.c | |
| parent | Merge branch 'linus' into release (diff) | |
| parent | ACPI: Handle CONFIG_ACPI=n better from linux/acpi.h (diff) | |
| download | kernel-qcow2-linux-003d6a38ce1a59e0053a02fd9e9a65b588bc8e33.tar.gz kernel-qcow2-linux-003d6a38ce1a59e0053a02fd9e9a65b588bc8e33.tar.xz kernel-qcow2-linux-003d6a38ce1a59e0053a02fd9e9a65b588bc8e33.zip | |
Merge branch 'sfi-base' into release
Conflicts:
drivers/acpi/power.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/blacklist.c')
| -rw-r--r-- | drivers/acpi/blacklist.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c index 0c4ca4d318b3..e56b2a7b53db 100644 --- a/drivers/acpi/blacklist.c +++ b/drivers/acpi/blacklist.c @@ -34,6 +34,8 @@ #include <acpi/acpi_bus.h> #include <linux/dmi.h> +#include "internal.h" + enum acpi_blacklist_predicates { all_versions, less_than_or_equal, |