]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commit
mmc: s3mci: mark debug_regs[] as static
authorArnd Bergmann <arnd@arndb.de>
Wed, 3 Jan 2018 22:49:18 +0000 (23:49 +0100)
committerUlf Hansson <ulf.hansson@linaro.org>
Thu, 4 Jan 2018 11:42:31 +0000 (12:42 +0100)
commit2bd7b4aacdb6efa5ccd4749c365c171b884791d2
tree992bf7258a89e7d7645bf66d5d088f31553e105c
parent967a6a07e95c58eb9c1581d22a1d9c2d1929843f
mmc: s3mci: mark debug_regs[] as static

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 <arnd@arndb.de>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/s3cmci.c