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 'for-upstream' of http://github.com/agraf/linux-2.6 into queue
[linux-2.6-microblaze.git]
/
arch
/
arm
/
mach-pxa
/
spitz.c
diff --git
a/arch/arm/mach-pxa/spitz.c
b/arch/arm/mach-pxa/spitz.c
index
363d91b
..
2073f0e
100644
(file)
--- a/
arch/arm/mach-pxa/spitz.c
+++ b/
arch/arm/mach-pxa/spitz.c
@@
-41,10
+41,10
@@
#include <mach/pxa27x.h>
#include <mach/pxa27x-udc.h>
#include <mach/reset.h>
#include <mach/pxa27x.h>
#include <mach/pxa27x-udc.h>
#include <mach/reset.h>
-#include <
mach/irda
.h>
-#include <
mach/mmc
.h>
-#include <
mach/ohci
.h>
-#include <
mach/
pxafb.h>
+#include <
linux/platform_data/irda-pxaficp
.h>
+#include <
linux/platform_data/mmc-pxamci
.h>
+#include <
linux/platform_data/usb-ohci-pxa27x
.h>
+#include <
linux/platform_data/video-
pxafb.h>
#include <mach/spitz.h>
#include <mach/sharpsl_pm.h>
#include <mach/smemc.h>
#include <mach/spitz.h>
#include <mach/sharpsl_pm.h>
#include <mach/smemc.h>