summaryrefslogtreecommitdiff
path: root/init/initramfs.c
diff options
context:
space:
mode:
authorNishanth Aravamudan <nacc@linux.vnet.ibm.com>2014-08-11 16:43:18 -0700
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2014-08-13 15:13:47 +1000
commit56758e3c3ca7e3d8960e0e8f881e80adf119f4fe (patch)
treee9c8aa463f205058b73fdcad109514e7fe55326f /init/initramfs.c
parent5efbabe09d986f25c02d19954660238fcd7f008a (diff)
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 <nacc@linux.vnet.ibm.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'init/initramfs.c')
0 files changed, 0 insertions, 0 deletions