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/cjb/mmc
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap1
/
board-h3.c
diff --git
a/arch/arm/mach-omap1/board-h3.c
b/arch/arm/mach-omap1/board-h3.c
index
31f3487
..
8f5b6af
100644
(file)
--- a/
arch/arm/mach-omap1/board-h3.c
+++ b/
arch/arm/mach-omap1/board-h3.c
@@
-13,7
+13,7
@@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
-
+#include <linux/gpio.h>
#include <linux/types.h>
#include <linux/init.h>
#include <linux/major.h>
#include <linux/types.h>
#include <linux/init.h>
#include <linux/major.h>
@@
-34,7
+34,6
@@
#include <asm/setup.h>
#include <asm/page.h>
#include <mach/hardware.h>
#include <asm/setup.h>
#include <asm/page.h>
#include <mach/hardware.h>
-#include <asm/gpio.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
@@
-449,7
+448,7
@@
static void __init h3_map_io(void)
MACHINE_START(OMAP_H3, "TI OMAP1710 H3 board")
/* Maintainer: Texas Instruments, Inc. */
MACHINE_START(OMAP_H3, "TI OMAP1710 H3 board")
/* Maintainer: Texas Instruments, Inc. */
- .
boot_params = 0x10000
100,
+ .
atag_offset = 0x
100,
.map_io = h3_map_io,
.reserve = omap_reserve,
.init_irq = h3_init_irq,
.map_io = h3_map_io,
.reserve = omap_reserve,
.init_irq = h3_init_irq,