git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
cm-x270.c
diff --git
a/arch/arm/mach-pxa/cm-x270.c
b/arch/arm/mach-pxa/cm-x270.c
index
a9926bb
..
b88d601
100644
(file)
--- a/
arch/arm/mach-pxa/cm-x270.c
+++ b/
arch/arm/mach-pxa/cm-x270.c
@@
-19,12
+19,12
@@
#include <video/mbxfb.h>
#include <linux/spi/spi.h>
+#include <linux/spi/pxa2xx_spi.h>
#include <linux/spi/libertas_spi.h>
#include <mach/pxa27x.h>
#include <mach/ohci.h>
#include <mach/mmc.h>
-#include <mach/pxa2xx_spi.h>
#include "generic.h"