projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-block.git]
/
drivers
/
acpi
/
osl.c
diff --git
a/drivers/acpi/osl.c
b/drivers/acpi/osl.c
index 3935745ac78bf83e2299172fef06f342a038b65a..32d684af0ec7c8a36781e5b7e712c7dd0e65b241 100644
(file)
--- a/
drivers/acpi/osl.c
+++ b/
drivers/acpi/osl.c
@@
-43,7
+43,7
@@
#include <asm/io.h>
#include <asm/uaccess.h>
-#include <
asm-generic
/io-64-nonatomic-lo-hi.h>
+#include <
linux
/io-64-nonatomic-lo-hi.h>
#include "internal.h"