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-ks8695
/
board-acs5k.c
diff --git
a/arch/arm/mach-ks8695/board-acs5k.c
b/arch/arm/mach-ks8695/board-acs5k.c
index
3ca4f8e
..
a91f99d
100644
(file)
--- a/
arch/arm/mach-ks8695/board-acs5k.c
+++ b/
arch/arm/mach-ks8695/board-acs5k.c
@@
-10,7
+10,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/kernel.h>
#include <linux/types.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/interrupt.h>
@@
-34,7
+34,7
@@
#include <asm/mach/irq.h>
#include <mach/devices.h>
#include <asm/mach/irq.h>
#include <mach/devices.h>
-#include <mach/gpio.h>
+#include <mach/gpio
-ks8695
.h>
#include "generic.h"
#include "generic.h"
@@
-223,7
+223,7
@@
static void __init acs5k_init(void)
MACHINE_START(ACS5K, "Brivo Systems LLC ACS-5000 Master board")
/* Maintainer: Simtec Electronics. */
MACHINE_START(ACS5K, "Brivo Systems LLC ACS-5000 Master board")
/* Maintainer: Simtec Electronics. */
- .
boot_params = KS8695_SDRAM_PA +
0x100,
+ .
atag_offset =
0x100,
.map_io = ks8695_map_io,
.init_irq = ks8695_init_irq,
.init_machine = acs5k_init,
.map_io = ks8695_map_io,
.init_irq = ks8695_init_irq,
.init_machine = acs5k_init,