diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-01-03 10:26:17 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-01-08 16:26:15 +0100 |
| commit | c7fc46fd1410a7452db29ee8cd1f85c233000ec9 (patch) | |
| tree | 036c46b265c84a8b9b6b6f0de36f527b54a595f4 /drivers/staging/ccree | |
| parent | 21c0885fd1f67845c59ee37989925e99fcc9018f (diff) | |
| download | linux-stable-c7fc46fd1410a7452db29ee8cd1f85c233000ec9.tar.gz linux-stable-c7fc46fd1410a7452db29ee8cd1f85c233000ec9.tar.bz2 linux-stable-c7fc46fd1410a7452db29ee8cd1f85c233000ec9.zip | |
staging: ccree: mark debug_regs[] as static
The global array clashes with an existing 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 ccree driver by removing
the symbol from the global namespace.
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>
Acked-by: Gilad Ben-Yossef <gilad@benyossef.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/ccree')
| -rw-r--r-- | drivers/staging/ccree/cc_debugfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/ccree/cc_debugfs.c b/drivers/staging/ccree/cc_debugfs.c index 7cd33957fdc6..662fa07af832 100644 --- a/drivers/staging/ccree/cc_debugfs.c +++ b/drivers/staging/ccree/cc_debugfs.c @@ -37,7 +37,7 @@ struct cc_debugfs_ctx { */ static struct dentry *cc_debugfs_dir; -struct debugfs_reg32 debug_regs[] = { +static struct debugfs_reg32 debug_regs[] = { CC_DEBUG_REG(HOST_SIGNATURE), CC_DEBUG_REG(HOST_IRR), CC_DEBUG_REG(HOST_POWER_DOWN_EN), |