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 'apei-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb...
[pandora-kernel.git]
/
include
/
acpi
/
apei.h
diff --git
a/include/acpi/apei.h
b/include/acpi/apei.h
index
e67b523
..
51a527d
100644
(file)
--- a/
include/acpi/apei.h
+++ b/
include/acpi/apei.h
@@
-18,6
+18,11
@@
extern int hest_disable;
extern int erst_disable;
+#ifdef CONFIG_ACPI_APEI_GHES
+extern int ghes_disable;
+#else
+#define ghes_disable 1
+#endif
#ifdef CONFIG_ACPI_APEI
void __init acpi_hest_init(void);