Skip to content

Commit

Permalink
[ARM] 3478/1: SharpSL SCOOP: Fix potenial build failure
Browse files Browse the repository at this point in the history
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: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Richard Purdie authored and Russell King committed Apr 18, 2006
1 parent a9a5cd5 commit 7ea3bbb
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
12 changes: 12 additions & 0 deletions arch/arm/common/scoop.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,18 @@
#include <asm/io.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)))

struct scoop_dev {
Expand Down
8 changes: 0 additions & 8 deletions drivers/pcmcia/pxa2xx_sharpsl.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,6 @@
#include "soc_common.h"

#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

static void sharpsl_pcmcia_init_reset(struct soc_pcmcia_socket *skt)
Expand Down

0 comments on commit 7ea3bbb

Please sign in to comment.