summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.transmeta.com>2003-04-22 22:50:06 -0700
committerLinus Torvalds <torvalds@home.transmeta.com>2003-04-22 22:50:06 -0700
commitb3d4c0270080c88e41704740ff9f413ce4067715 (patch)
tree3efd4c6dd89e8bbc343dfed4d79079ced104fc58 /include/linux
parent968e1e4ba51a0826a5985150219b9a536c340df2 (diff)
parent05304b9d15febc4e5b998e9bdc307ee925a661b3 (diff)
Merge bk://kernel.bkbits.net/davem/sparc-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/acpi.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 26e04ac5ebca..976551db820e 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -33,6 +33,7 @@
#include <acpi/acpi.h>
#include <acpi/acpi_bus.h>
+#include <acpi/acpi_drivers.h>
#include <asm/acpi.h>