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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[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
d51ee3d
..
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/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"
#include <linux/can/platform/mcp251x.h>
#include "generic.h"
@@
-192,7
+192,7
@@
static void __init icontrol_init(void)
MACHINE_START(ICONTROL, "iControl/SafeTcam boards using Embedian MXM-8x10 CoM")
.boot_params = 0xa0000100,
MACHINE_START(ICONTROL, "iControl/SafeTcam boards using Embedian MXM-8x10 CoM")
.boot_params = 0xa0000100,
- .map_io = pxa_map_io,
+ .map_io = pxa
3xx
_map_io,
.init_irq = pxa3xx_init_irq,
.timer = &pxa_timer,
.init_machine = icontrol_init
.init_irq = pxa3xx_init_irq,
.timer = &pxa_timer,
.init_machine = icontrol_init