Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81513398 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'at91-ab-4.11-soc' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents d2d08aba 6cc7fbdf

arch/arm/mach-at91/pm.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

{

arch/arm/mach-at91/pm.h

+0 −2
Original line number Diff line number Diff line
@@ -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)