diff options
| author | Olof Johansson <olof@lixom.net> | 2017-01-18 16:16:06 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-01-18 16:16:06 -0800 |
| commit | 815133987cc94670e1db9c9f9a6a2284e9e9fd89 (patch) | |
| tree | 8c5d57651cfc850e1a2a3e3cb2a401cce7ae8088 | |
| parent | d2d08aba624899d159fbe5b0ed3a6915232e42c7 (diff) | |
| parent | 6cc7fbdf8d931eefa2d0aabf0d2840e94ba09ae5 (diff) | |
Merge tag 'at91-ab-4.11-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/soc
SoC for 4.11:
- small cleanup
* tag 'at91-ab-4.11-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
ARM: at91: pm: remove useless extern definition
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/mach-at91/pm.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-at91/pm.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index b4332b727e9c..3d89b7905bd9 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c @@ -55,7 +55,7 @@ static struct { int memctrl; } at91_pm_data; -void __iomem *at91_ramc_base[2]; +static void __iomem *at91_ramc_base[2]; static int at91_pm_valid_state(suspend_state_t state) { diff --git a/arch/arm/mach-at91/pm.h b/arch/arm/mach-at91/pm.h index 3fcf8810f14e..bf980c6ef294 100644 --- a/arch/arm/mach-at91/pm.h +++ b/arch/arm/mach-at91/pm.h @@ -18,8 +18,6 @@ #include <soc/at91/at91sam9_sdramc.h> #ifndef __ASSEMBLY__ -extern void __iomem *at91_ramc_base[]; - #define at91_ramc_read(id, field) \ __raw_readl(at91_ramc_base[id] + field) |