git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
[pandora-kernel.git]
/
drivers
/
acpi
/
hest.c
diff --git
a/drivers/acpi/hest.c
b/drivers/acpi/hest.c
index
4bb18c9
..
1c527a1
100644
(file)
--- a/
drivers/acpi/hest.c
+++ b/
drivers/acpi/hest.c
@@
-123,6
+123,10
@@
int acpi_hest_firmware_first_pci(struct pci_dev *pci)
{
acpi_status status = AE_NOT_FOUND;
struct acpi_table_header *hest = NULL;
+
+ if (acpi_disabled)
+ return 0;
+
status = acpi_get_table(ACPI_SIG_HEST, 1, &hest);
if (ACPI_SUCCESS(status)) {