From: Nishanth Aravamudan Date: Mon, 11 Aug 2014 23:43:18 +0000 (-0700) Subject: powerpc: remove duplicate definition of TEXASR_FS X-Git-Tag: omap-for-v3.17/fixes-against-rc2~65^2~12 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56758e3c3ca7e3d8960e0e8f881e80adf119f4fe;p=pandora-kernel.git powerpc: remove duplicate definition of TEXASR_FS It appears that commits 7f06f21d40a6 ("powerpc/tm: Add checking to treclaim/trechkpt") and e4e38121507a ("KVM: PPC: Book3S HV: Add transactional memory support") both added definitions of TEXASR_FS. Remove one of them. At the same time, fix the alignment of the remaining definition (should be tab-separated like the rest of the #defines). Signed-off-by: Nishanth Aravamudan Signed-off-by: Benjamin Herrenschmidt --- Reading git-diff-tree failed