Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
[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>
authored by Richard Purdie and committed by Russell King 7ea3bbbc a9a5cd5d
+12
arch/arm/common/scoop.c
+12
arch/arm/common/scoop.c
···
18
18
#include <asm/io.h>
19
19
#include <asm/hardware/scoop.h>
20
20
21
+
/* PCMCIA to Scoop linkage
22
+
23
+
There is no easy way to link multiple scoop devices into one
24
+
single entity for the pxa2xx_pcmcia device so this structure
25
+
is used which is setup by the platform code.
26
+
27
+
This file is never modular so this symbol is always
28
+
accessile to the board support files.
29
+
*/
30
+
struct scoop_pcmcia_config *platform_scoop_config;
31
+
EXPORT_SYMBOL(platform_scoop_config);
32
+
21
33
#define SCOOP_REG(d,adr) (*(volatile unsigned short*)(d +(adr)))
22
34
23
35
struct scoop_dev {
-8
drivers/pcmcia/pxa2xx_sharpsl.c
-8
drivers/pcmcia/pxa2xx_sharpsl.c
···
26
26
#include "soc_common.h"
27
27
28
28
#define NO_KEEP_VS 0x0001
29
-
30
-
/* PCMCIA to Scoop linkage
31
-
32
-
There is no easy way to link multiple scoop devices into one
33
-
single entity for the pxa2xx_pcmcia device so this structure
34
-
is used which is setup by the platform code
35
-
*/
36
-
struct scoop_pcmcia_config *platform_scoop_config;
37
29
#define SCOOP_DEV platform_scoop_config->devs
38
30
39
31
static void sharpsl_pcmcia_init_reset(struct soc_pcmcia_socket *skt)