From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 19 Nov 2014 09:15:33 +0000 (+0100)
Subject: sparc: io: remove duplicate relaxed accessors on sparc32
X-Git-Tag: omap-for-v3.19/fixes-for-merge-window~8^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c3969c3a4f3593bf7963355e10401a8638cb1cb;p=pandora-kernel.git

sparc: io: remove duplicate relaxed accessors on sparc32

Commit 1191ccb34cf8 ("sparc: io: implement dummy relaxed accessor
macros for writes") added the relaxed accessors (readl_relaxed etc) in
a file that is shared between sparc32 and sparc64. However, the earlier
e1039fb42609 ("sparc32: introduce asm-generic/io.h") had already changed
the sparc32 implementation to use asm-generic/io.h, which provides the
same macros, resulting in lots of build errors.

This moves the definitions from the shared sparc file into the
sparc64-only file to fix the sparc32 build regression.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Fixes: 1191ccb34cf8 ("sparc: io: implement dummy relaxed accessor macros for writes")
---

Reading git-diff-tree failed