ARM: mxs: move mxs_get_ocotp() into mach-mxs.c
authorShawn Guo <shawn.guo@linaro.org>
Fri, 29 Mar 2013 05:27:55 +0000 (13:27 +0800)
committerShawn Guo <shawn.guo@linaro.org>
Mon, 1 Apr 2013 12:42:19 +0000 (20:42 +0800)
All the users of mxs_get_ocotp() are in mach-mxs.c.  Move the function
into mach-mxs.c, make it a static function, and then remove ocotp.c.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
arch/arm/mach-mxs/Makefile
arch/arm/mach-mxs/include/mach/common.h
arch/arm/mach-mxs/mach-mxs.c
arch/arm/mach-mxs/ocotp.c [deleted file]

Simple merge
Simple merge
diff --cc arch/arm/mach-mxs/ocotp.c
Simple merge