git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[ACPI] Merge acpi-2.6.12 branch into 2.6.13-rc3
[sfrench/cifs-2.6.git]
/
arch
/
ia64
/
kernel
/
acpi.c
diff --git
a/arch/ia64/kernel/acpi.c
b/arch/ia64/kernel/acpi.c
index 9609f243e5d05d2591393a66e1a542cb6058ecbc..d362ecf5381bc8681d171e8dd922913221cd9192 100644
(file)
--- a/
arch/ia64/kernel/acpi.c
+++ b/
arch/ia64/kernel/acpi.c
@@
-563,7
+563,11
@@
acpi_numa_arch_fixup (void)
}
#endif /* CONFIG_ACPI_NUMA */
-unsigned int
+/*
+ * success: return IRQ number (>=0)
+ * failure: return < 0
+ */
+int
acpi_register_gsi (u32 gsi, int edge_level, int active_high_low)
{
if (has_8259 && gsi < 16)