diff options
| author | Ingo Molnar | 2008-07-31 18:43:41 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2008-07-31 18:43:41 +0200 |
| commit | 85e9ca333d03fbd56b9e123c8456f0d98e20faad (patch) | |
| tree | 7bb15ada5f536950efa23ad60ea9eea60380ca1c /include/asm-arm/kexec.h | |
| parent | documentation: move hpet.txt to timers/ subdirectory (diff) | |
| parent | Linux 2.6.27-rc1 (diff) | |
| download | kernel-qcow2-linux-85e9ca333d03fbd56b9e123c8456f0d98e20faad.tar.gz kernel-qcow2-linux-85e9ca333d03fbd56b9e123c8456f0d98e20faad.tar.xz kernel-qcow2-linux-85e9ca333d03fbd56b9e123c8456f0d98e20faad.zip | |
Merge branch 'linus' into timers/hpet
Diffstat (limited to 'include/asm-arm/kexec.h')
| -rw-r--r-- | include/asm-arm/kexec.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-arm/kexec.h b/include/asm-arm/kexec.h index 47fe34d692da..c8986bb99ed5 100644 --- a/include/asm-arm/kexec.h +++ b/include/asm-arm/kexec.h @@ -14,8 +14,6 @@ #define KEXEC_ARCH KEXEC_ARCH_ARM -#define KEXEC_BOOT_PARAMS_SIZE 1536 - #define KEXEC_ARM_ATAGS_OFFSET 0x1000 #define KEXEC_ARM_ZIMAGE_OFFSET 0x8000 |