diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-06 16:58:33 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-06 16:58:33 -0800 |
| commit | ec773e99ab4abce07b1ae23117179c2861831964 (patch) | |
| tree | 630de8df04406f7de326349169d9a61e51864c99 /drivers | |
| parent | 534baf55dd16d5de9c8d045190469eef9d31ffff (diff) | |
| parent | 7a3f8de5a3c36e5fde130cae74a06663b59837ae (diff) | |
| download | linux-ec773e99ab4abce07b1ae23117179c2861831964.tar.bz2 | |
Merge branch 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
* 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:
ARM: PXA: fix includes in pxa2xx_cm_x2xx PCMCIA driver
ARM: PXA: fix gpio-pxa.h build errors
ARM: 7142/1: davinci: mark GPIO implementation complex
ARM: 7134/1: Revert "EXYNOS4: Fix routing timer interrupt to offline CPU"
ARM: PXA: eseries: fix eseries_register_clks section mismatch warning
ARM: PXA: fix lubbock PCMCIA driver build error
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pcmcia/pxa2xx_base.c | 1 | ||||
| -rw-r--r-- | drivers/pcmcia/pxa2xx_cm_x2xx.c | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c index 2c540542b5af..a87e2728b2c3 100644 --- a/drivers/pcmcia/pxa2xx_base.c +++ b/drivers/pcmcia/pxa2xx_base.c @@ -231,6 +231,7 @@ void pxa2xx_configure_sockets(struct device *dev) __raw_writel(mecr, MECR); } +EXPORT_SYMBOL(pxa2xx_configure_sockets); static const char *skt_names[] = { "PCMCIA socket 0", diff --git a/drivers/pcmcia/pxa2xx_cm_x2xx.c b/drivers/pcmcia/pxa2xx_cm_x2xx.c index 4f09506ad8d4..6e7dcfd22ede 100644 --- a/drivers/pcmcia/pxa2xx_cm_x2xx.c +++ b/drivers/pcmcia/pxa2xx_cm_x2xx.c @@ -12,9 +12,8 @@ #include <linux/module.h> -#include <asm/system.h> #include <asm/mach-types.h> -#include <mach/system.h> +#include <mach/hardware.h> int cmx255_pcmcia_init(void); int cmx270_pcmcia_init(void); |