summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2006-04-18 23:18:53 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-04-18 23:18:53 +0100
commit7ea3bbbc8997df1ae7dc4e736d163dabc00f4721 (patch)
tree30bbfb741d7e1e0bafb27097d496f75e7bf44d05 /arch/arm
parenta9a5cd5d2a57fb76dbae2115450f777b69beccf7 (diff)
downloadlinux-stable-7ea3bbbc8997df1ae7dc4e736d163dabc00f4721.tar.gz
linux-stable-7ea3bbbc8997df1ae7dc4e736d163dabc00f4721.tar.bz2
linux-stable-7ea3bbbc8997df1ae7dc4e736d163dabc00f4721.zip
[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: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/common/scoop.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c
index 5e830f444c6c..314ebd3a1d71 100644
--- a/arch/arm/common/scoop.c
+++ b/arch/arm/common/scoop.c
@@ -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 {