diff options
| author | James Morris <jmorris@namei.org> | 2008-11-13 19:29:12 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-11-13 19:29:12 -0500 |
| commit | 2b828925652340277a889cbc11b2d0637f7cdaf7 (patch) | |
| tree | 32fcb3d3e466fc419fad2d3717956a5b5ad3d35a /arch/arm/mach-clps7500/include/mach/hardware.h | |
| parent | 3a3b7ce9336952ea7b9564d976d068a238976c9d (diff) | |
| parent | 58e20d8d344b0ee083febb18c2b021d2427e56ca (diff) | |
Merge branch 'master' into next
Conflicts:
security/keys/internal.h
security/keys/process_keys.c
security/keys/request_key.c
Fixed conflicts above by using the non 'tsk' versions.
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'arch/arm/mach-clps7500/include/mach/hardware.h')
| -rw-r--r-- | arch/arm/mach-clps7500/include/mach/hardware.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-clps7500/include/mach/hardware.h b/arch/arm/mach-clps7500/include/mach/hardware.h index d66578a3371c..a6ad1d44badf 100644 --- a/arch/arm/mach-clps7500/include/mach/hardware.h +++ b/arch/arm/mach-clps7500/include/mach/hardware.h | |||
| @@ -39,9 +39,9 @@ | |||
| 39 | #define ISA_SIZE 0x00010000 | 39 | #define ISA_SIZE 0x00010000 |
| 40 | #define ISA_BASE 0xe1000000 | 40 | #define ISA_BASE 0xe1000000 |
| 41 | 41 | ||
| 42 | #define FLASH_START 0x01000000 /* XXX */ | 42 | #define CLPS7500_FLASH_START 0x01000000 /* XXX */ |
| 43 | #define FLASH_SIZE 0x01000000 | 43 | #define CLPS7500_FLASH_SIZE 0x01000000 |
| 44 | #define FLASH_BASE 0xe2000000 | 44 | #define CLPS7500_FLASH_BASE 0xe2000000 |
| 45 | 45 | ||
| 46 | #define LED_START 0x0302B000 | 46 | #define LED_START 0x0302B000 |
| 47 | #define LED_SIZE 0x00001000 | 47 | #define LED_SIZE 0x00001000 |