projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'akpm' (patches from Andrew)
[linux-2.6-microblaze.git]
/
drivers
/
acpi
/
scan.c
diff --git
a/drivers/acpi/scan.c
b/drivers/acpi/scan.c
index
5287ab9
..
4da23e7
100644
(file)
--- a/
drivers/acpi/scan.c
+++ b/
drivers/acpi/scan.c
@@
-15,8
+15,7
@@
#include <linux/nls.h>
#include <linux/dma-mapping.h>
#include <linux/platform_data/x86/apple.h>
-
-#include <asm/pgtable.h>
+#include <linux/pgtable.h>
#include "internal.h"