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

Commit 7ea3bbbc authored by Richard Purdie's avatar Richard Purdie Committed by Russell King
Browse files

[ARM] 3478/1: SharpSL SCOOP: Fix potenial build failure 



Patch from Richard Purdie

Move platform_scoop_config from the SharpSL scoop PCMCIA driver to
the SCOOP driver. This avoids build failures when PCMCIA is not built
or is modular (scoop.c itself cannot be modular).

Signed-off-by: default avatarRichard Purdie <rpurdie@rpsys.net>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent a9a5cd5d

arch/arm/common/scoop.c

+12 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,18 @@ 
#include <asm/io.h>

#include <asm/io.h>

#include <asm/hardware/scoop.h>

#include <asm/hardware/scoop.h>





/* PCMCIA to Scoop linkage



   There is no easy way to link multiple scoop devices into one

   single entity for the pxa2xx_pcmcia device so this structure

   is used which is setup by the platform code.



   This file is never modular so this symbol is always

   accessile to the board support files.

*/

struct scoop_pcmcia_config *platform_scoop_config;

EXPORT_SYMBOL(platform_scoop_config);



#define SCOOP_REG(d,adr) (*(volatile unsigned short*)(d +(adr)))

#define SCOOP_REG(d,adr) (*(volatile unsigned short*)(d +(adr)))





struct  scoop_dev {

struct  scoop_dev {

drivers/pcmcia/pxa2xx_sharpsl.c

+0 −8
Original line number Original line Diff line number Diff line
@@ -26,14 +26,6 @@ 
#include "soc_common.h"

#include "soc_common.h"





#define	NO_KEEP_VS 0x0001

#define	NO_KEEP_VS 0x0001



/* PCMCIA to Scoop linkage



   There is no easy way to link multiple scoop devices into one

   single entity for the pxa2xx_pcmcia device so this structure

   is used which is setup by the platform code

*/

struct scoop_pcmcia_config *platform_scoop_config;

#define SCOOP_DEV platform_scoop_config->devs

#define SCOOP_DEV platform_scoop_config->devs





static void sharpsl_pcmcia_init_reset(struct soc_pcmcia_socket *skt)

static void sharpsl_pcmcia_init_reset(struct soc_pcmcia_socket *skt)