diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-04 23:17:25 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-04 23:17:25 -0400 |
| commit | 54d69df5849ec2e660aa12ac75562618c10fb499 (patch) | |
| tree | adbfb8bcc7cc73b83bf2b784fa331911ba03573a /arch/arm/mach-sa1100/include/mach/simpad.h | |
| parent | ad932bb6b549722a561fb31ac2fa50dcbcb3e36b (diff) | |
| parent | 46f2007c1efadfa4071c17e75f140c47f09293de (diff) | |
Merge branch 'late/kirkwood' into late/soc
Merge in the late Kirkwood branch with the OMAP late branch for upstream
submission.
Final contents described in shared tag.
Fixup remove/change conflicts in arch/arm/mach-omap2/devices.c and
drivers/spi/spi-omap2-mcspi.c.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-sa1100/include/mach/simpad.h')
| -rw-r--r-- | arch/arm/mach-sa1100/include/mach/simpad.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-sa1100/include/mach/simpad.h b/arch/arm/mach-sa1100/include/mach/simpad.h index cdea671e8931..ac2ea767215d 100644 --- a/arch/arm/mach-sa1100/include/mach/simpad.h +++ b/arch/arm/mach-sa1100/include/mach/simpad.h | |||
| @@ -87,7 +87,7 @@ | |||
| 87 | #define SIMPAD_CS3_PCMCIA_SHORT (SIMPAD_CS3_GPIO_BASE + 22) | 87 | #define SIMPAD_CS3_PCMCIA_SHORT (SIMPAD_CS3_GPIO_BASE + 22) |
| 88 | #define SIMPAD_CS3_GPIO_23 (SIMPAD_CS3_GPIO_BASE + 23) | 88 | #define SIMPAD_CS3_GPIO_23 (SIMPAD_CS3_GPIO_BASE + 23) |
| 89 | 89 | ||
| 90 | #define CS3_BASE 0xf1000000 | 90 | #define CS3_BASE IOMEM(0xf1000000) |
| 91 | 91 | ||
| 92 | long simpad_get_cs3_ro(void); | 92 | long simpad_get_cs3_ro(void); |
| 93 | long simpad_get_cs3_shadow(void); | 93 | long simpad_get_cs3_shadow(void); |