From: Arnd Bergmann Date: Wed, 3 Jan 2018 22:49:18 +0000 (+0100) Subject: mmc: s3mci: mark debug_regs[] as static X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a2d195c51a6a1fd965cc5b81146189eda9457ac;p=pandora-kernel.git mmc: s3mci: mark debug_regs[] as static commit 2bd7b4aacdb6efa5ccd4749c365c171b884791d2 upstream. The global array clashes with a newly added symbol of the same name: drivers/staging/ccree/cc_debugfs.o:(.data+0x0): multiple definition of `debug_regs' drivers/mmc/host/s3cmci.o:(.data+0x70): first defined here We should fix both, this one addresses the s3cmci driver by removing the symbol from the global namespace. While at it, this separates the declaration from the type definition and makes the variable const. Fixes: 9bdd203b4dc8 ("s3cmci: add debugfs support for examining driver and hardware state") Fixes: b3ec9a6736f2 ("staging: ccree: staging: ccree: replace sysfs by debugfs interface") Signed-off-by: Arnd Bergmann Signed-off-by: Ulf Hansson Signed-off-by: Ben Hutchings --- Reading git-diff-tree failed