From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751957AbeACJ0i (ORCPT + 1 other); Wed, 3 Jan 2018 04:26:38 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:60905 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751931AbeACJ0g (ORCPT ); Wed, 3 Jan 2018 04:26:36 -0500 From: Arnd Bergmann To: Gilad Ben-Yossef , Greg Kroah-Hartman Cc: Arnd Bergmann , linux-crypto@vger.kernel.org, driverdev-devel@linuxdriverproject.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH] staging: ccree: mark debug_regs[] as static Date: Wed, 3 Jan 2018 10:26:17 +0100 Message-Id: <20180103092628.1930457-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:hTAaDoWQF95b1DGGNcK6gc5WIFZsjSYUPg8ph1cNpUEckB8KqvG fUSFl+jna7Dv1WUqxuT1lvA+UotpMJGTkwMt8kcNrO6Q2lWbQ+Yu0i8JN7NIe/eUGr6INn2 er2xmlLJM2hh+BTghgvNztGXX3WxQoP7+mhMnC0uTaCPNA1E/QETZW1VpH/Q6fmD+wBNM8V Rm7x9iP4e5UzqnIL8+LOQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:KRfZGrqGqNs=:bKMRfip2QVK6nQbcYvsgN6 rwDiuBK95WIZFxOvCsdcFBcsyeqmCmkzrRJhq81cMH/fo/MBaMCB1KKGKY6dkN+nO6QOI8PN+ zNMjdEcd9hY/VX+OMoojbymDcmoSOEAHT56RujY40s7R5q09E3NMGSMyZbzYh1pxA34wWI978 NTxxZ3THeJX0VwgNTopOEwf5k4zaixAwSQUcBZ20pW3LnGNPNsUB+wWhW8SlxwlYDWKtuoCNP iqz1Uhv7EQ5jqhrdy/znKApVIMbqpcXjJgTDR5svggv6WrRUeaJFhT2lIlvq3lFe9XLH7QReh OZewSaVD61AakbrCYQCE629A2FWFGu1Mh1986no/7YefFfwmHRoYUOQwiwL9ZARYufimV2d2B UrbM6zmvGcoaqradEEdpvDOeXwRnFDJKOdlfjjMhpjW02uWwCs4Z3xHe8siksH3/BA4s/w9sV O7IibyiqR8Dzq5sd/YBFUpj+WXGsTK4pPYZiIh2BvnPu2veX7lD4fRD4K71kDWZu4N+KqWPoi iXxNaOOEcgbRkm8a84TJ6UljWiWWTHX43hotw/1qN1374Emm/v88LNhjelXyD2wlQw2EPW2VO zenDgqURdVkHfZhTz3o3HaQtrLXisavm/mhOw5z2Tw050qagjAiBYnAfattd22EPXJIJhJx6Y sqlSwdkna+EnzjLUFXvt76AYtQ67WN6ZHuik0KV7kSml2juxbnev0yqXzWwaOv8MGH+gg1l5v tVxCgHar+6DCWMmh+Gfoxu4CHb0DaD4Ntyb0bQ== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: 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 --- drivers/staging/ccree/cc_debugfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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), -- 2.9.0