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' of git://github.com/kernelslacker/cpufreq
[pandora-kernel.git]
/
arch
/
arm
/
mach-mx5
/
board-mx51_3ds.c
diff --git
a/arch/arm/mach-mx5/board-mx51_3ds.c
b/arch/arm/mach-mx5/board-mx51_3ds.c
index
5f4a168
..
0578390
100644
(file)
--- a/
arch/arm/mach-mx5/board-mx51_3ds.c
+++ b/
arch/arm/mach-mx5/board-mx51_3ds.c
@@
-25,7
+25,6
@@
#include <mach/3ds_debugboard.h>
#include "devices-imx51.h"
#include <mach/3ds_debugboard.h>
#include "devices-imx51.h"
-#include "devices.h"
#define EXPIO_PARENT_INT gpio_to_irq(IMX_GPIO_NR(1, 6))
#define MX51_3DS_ECSPI2_CS (GPIO_PORTC + 28)
#define EXPIO_PARENT_INT gpio_to_irq(IMX_GPIO_NR(1, 6))
#define MX51_3DS_ECSPI2_CS (GPIO_PORTC + 28)
@@
-169,7
+168,7
@@
static struct sys_timer mx51_3ds_timer = {
MACHINE_START(MX51_3DS, "Freescale MX51 3-Stack Board")
/* Maintainer: Freescale Semiconductor, Inc. */
MACHINE_START(MX51_3DS, "Freescale MX51 3-Stack Board")
/* Maintainer: Freescale Semiconductor, Inc. */
- .
boot_params = MX51_PHYS_OFFSET +
0x100,
+ .
atag_offset =
0x100,
.map_io = mx51_map_io,
.init_early = imx51_init_early,
.init_irq = mx51_init_irq,
.map_io = mx51_map_io,
.init_early = imx51_init_early,
.init_irq = mx51_init_irq,