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 'next-spi' of git://git.secretlab.ca/git/linux-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
icontrol.c
diff --git
a/arch/arm/mach-pxa/icontrol.c
b/arch/arm/mach-pxa/icontrol.c
index
ac6ee12
..
6cedc81
100644
(file)
--- a/
arch/arm/mach-pxa/icontrol.c
+++ b/
arch/arm/mach-pxa/icontrol.c
@@
-24,7
+24,7
@@
#include <mach/mxm8x10.h>
#include <linux/spi/spi.h>
-#include <
mach
/pxa2xx_spi.h>
+#include <
linux/spi
/pxa2xx_spi.h>
#include <linux/can/platform/mcp251x.h>
#include "generic.h"