From: Victor Kamensky <victor.kamensky@linaro.org>
Date: Tue, 25 Feb 2014 07:41:09 +0000 (+0100)
Subject: ARM: 7990/1: asm: rename logical shift macros push pull into lspush lspull
X-Git-Tag: v3.15-rc1~82^2~1^3~17
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d98b90ea22b0a28d9d787769704a9cf1ea5a513a;p=pandora-kernel.git

ARM: 7990/1: asm: rename logical shift macros push pull into lspush lspull

Renames logical shift macros, 'push' and 'pull', defined in
arch/arm/include/asm/assembler.h, into 'lspush' and 'lspull'.
That eliminates name conflict between 'push' logical shift macro
and 'push' instruction mnemonic. That allows assembler.h to be
included in .S files that use 'push' instruction.

Suggested-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Victor Kamensky <victor.kamensky@linaro.org>
Acked-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

Reading git-diff-tree failed