diff options
| author |   Tony Luck <tony.luck@intel.com> | 2005-06-20 09:35:34 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-20 09:35:34 -0700 |
| commit | 8ba08378b479f472b37b83542c31bdad465033cf (patch) | |
| tree | f4421227b3065e786c9041cf0ce0073a249e011b /include/asm-arm/arch-integrator/platform.h | |
| parent | [IA64] Drop spurious paren in entry.h (diff) | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| download | linux-dev-8ba08378b479f472b37b83542c31bdad465033cf.tar.xz linux-dev-8ba08378b479f472b37b83542c31bdad465033cf.zip | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'include/asm-arm/arch-integrator/platform.h')
| -rw-r--r-- | include/asm-arm/arch-integrator/platform.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-arm/arch-integrator/platform.h b/include/asm-arm/arch-integrator/platform.h index bd364f5a99bc..96ad3d2a66d1 100644 --- a/include/asm-arm/arch-integrator/platform.h +++ b/include/asm-arm/arch-integrator/platform.h @@ -293,7 +293,11 @@ #define INTEGRATOR_DBG_SWITCH (INTEGRATOR_DBG_BASE + INTEGRATOR_DBG_SWITCH_OFFSET) +#if defined(CONFIG_ARCH_INTEGRATOR_AP) #define INTEGRATOR_GPIO_BASE 0x1B000000 /* GPIO */ +#elif defined(CONFIG_ARCH_INTEGRATOR_CP) +#define INTEGRATOR_GPIO_BASE 0xC9000000 /* GPIO */ +#endif /* ------------------------------------------------------------------------ * KMI keyboard/mouse definitions |