diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2011-07-26 19:45:54 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-17 10:12:40 +0200 |
commit | 3f8e288033ec7f52b570efad7c2eb42741f6d710 (patch) | |
tree | 4d02a74ad7f4254a844dc58152cdffb6b7c63c6f /arch/arm/include/asm/emergency-restart.h | |
parent | Merge branch 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-... (diff) | |
download | linux-3f8e288033ec7f52b570efad7c2eb42741f6d710.tar.xz linux-3f8e288033ec7f52b570efad7c2eb42741f6d710.zip |
ARM: 7006/1: Migrate to asm-generic wrapper support
With d8ecc5c (kbuild: asm-generic support, 2011-04-27) we can
remove a handful of asm-generic wrappers in ARM code. Since the
generic version of sizes.h doesn't contain SZ_48M, we replace
the 4 users of SZ_48M with the equivalent SZ_32M + SZ_16M.
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Cc: Imre Kaloz <kaloz@openwrt.org>
Acked-by: Krzysztof Halasa <khc@pm.waw.pl>
Cc: Eric Miao <eric.y.miao@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/include/asm/emergency-restart.h')
-rw-r--r-- | arch/arm/include/asm/emergency-restart.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/include/asm/emergency-restart.h b/arch/arm/include/asm/emergency-restart.h deleted file mode 100644 index 108d8c48e42e..000000000000 --- a/arch/arm/include/asm/emergency-restart.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_EMERGENCY_RESTART_H -#define _ASM_EMERGENCY_RESTART_H - -#include <asm-generic/emergency-restart.h> - -#endif /* _ASM_EMERGENCY_RESTART_H */ |