projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of /usr/src/ntfs-2.6/
[powerpc.git]
/
arch
/
arm
/
mach-pxa
/
generic.c
diff --git
a/arch/arm/mach-pxa/generic.c
b/arch/arm/mach-pxa/generic.c
index
9c02893
..
9b48a90
100644
(file)
--- a/
arch/arm/mach-pxa/generic.c
+++ b/
arch/arm/mach-pxa/generic.c
@@
-20,7
+20,7
@@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/delay.h>
-#include <linux/device.h>
+#include <linux/
platform_
device.h>
#include <linux/ioport.h>
#include <linux/pm.h>
#include <linux/string.h>