diff options
author | Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com> | 2008-05-30 10:46:30 +0200 |
---|---|---|
committer | Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com> | 2008-05-30 10:46:30 +0200 |
commit | e22af66fc85a8b008237970da4d9b6910422536b (patch) | |
tree | 4c5a71611b57d0e75af8a4bc3e0c44ec9431ecb3 /include/asm-arm | |
parent | ns9xxx: fix assembler version of __REG2 to be consistent with the C version (diff) | |
parent | clean up atags exporting code (diff) | |
download | linux-e22af66fc85a8b008237970da4d9b6910422536b.tar.xz linux-e22af66fc85a8b008237970da4d9b6910422536b.zip |
Merge branch 'atags' into for-rmk
Diffstat (limited to 'include/asm-arm')
-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 |