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-ks8695/include/mach/hardware.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-ks8695/include/mach/hardware.h')
| -rw-r--r-- | arch/arm/mach-ks8695/include/mach/hardware.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ks8695/include/mach/hardware.h b/arch/arm/mach-ks8695/include/mach/hardware.h index 5e0c388143da..5090338c0db2 100644 --- a/arch/arm/mach-ks8695/include/mach/hardware.h +++ b/arch/arm/mach-ks8695/include/mach/hardware.h | |||
| @@ -33,7 +33,7 @@ | |||
| 33 | * head debug code as the initial MMU setup only deals in L1 sections. | 33 | * head debug code as the initial MMU setup only deals in L1 sections. |
| 34 | */ | 34 | */ |
| 35 | #define KS8695_IO_PA 0x03F00000 | 35 | #define KS8695_IO_PA 0x03F00000 |
| 36 | #define KS8695_IO_VA 0xF0000000 | 36 | #define KS8695_IO_VA IOMEM(0xF0000000) |
| 37 | #define KS8695_IO_SIZE SZ_1M | 37 | #define KS8695_IO_SIZE SZ_1M |
| 38 | 38 | ||
| 39 | #define KS8695_PCIMEM_PA 0x60000000 | 39 | #define KS8695_PCIMEM_PA 0x60000000 |