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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
arch
/
x86
/
include
/
asm
/
acpi.h
diff --git
a/arch/x86/include/asm/acpi.h
b/arch/x86/include/asm/acpi.h
index
92091de
..
55d106b
100644
(file)
--- a/
arch/x86/include/asm/acpi.h
+++ b/
arch/x86/include/asm/acpi.h
@@
-93,6
+93,9
@@
extern u8 acpi_sci_flags;
extern int acpi_sci_override_gsi;
void acpi_pic_sci_set_trigger(unsigned int, u16);
+extern int (*__acpi_register_gsi)(struct device *dev, u32 gsi,
+ int trigger, int polarity);
+
static inline void disable_acpi(void)
{
acpi_disabled = 1;