diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-11-04 23:15:29 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-11-04 23:15:29 +0900 |
commit | d63638440cfad75fb339fd1261bea0485c7c3ecc (patch) | |
tree | d1705ceeef82eb0b7b58f9503a472be810f418f2 /arch/arm/mach-ks8695/board-acs5k.c | |
parent | f1e0477a7b7a541f51eea279910eed4ddd010033 (diff) | |
parent | 1a67a573b8d9f02211f36fbab50f6265dc49384a (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest
Diffstat (limited to 'arch/arm/mach-ks8695/board-acs5k.c')
-rw-r--r-- | arch/arm/mach-ks8695/board-acs5k.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-ks8695/board-acs5k.c b/arch/arm/mach-ks8695/board-acs5k.c index 3ca4f8e6f54..a91f99d265a 100644 --- 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. */ - +#include <linux/gpio.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 <mach/gpio.h> +#include <mach/gpio-ks8695.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. */ - .boot_params = KS8695_SDRAM_PA + 0x100, + .atag_offset = 0x100, .map_io = ks8695_map_io, .init_irq = ks8695_init_irq, .init_machine = acs5k_init, |