projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6
[cascardo/linux.git]
/
arch
/
arm
/
mach-integrator
/
integrator_cp.c
diff --git
a/arch/arm/mach-integrator/integrator_cp.c
b/arch/arm/mach-integrator/integrator_cp.c
index
3a730d4
..
a8b6aa6
100644
(file)
--- a/
arch/arm/mach-integrator/integrator_cp.c
+++ b/
arch/arm/mach-integrator/integrator_cp.c
@@
-14,7
+14,7
@@
#include <linux/platform_device.h>
#include <linux/dma-mapping.h>
#include <linux/string.h>
-#include <linux/
sysdev
.h>
+#include <linux/
device
.h>
#include <linux/amba/bus.h>
#include <linux/amba/kmi.h>
#include <linux/amba/clcd.h>