diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 16:19:05 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 16:20:07 +0100 |
| commit | f4e2467bad53023589cbff18dd1ab6e0aa3f004c (patch) | |
| tree | 8d7abbf418eabd25bbcdc9b6de2f8216d2eaa616 /drivers/spi | |
| parent | Merge branch 'next/cleanup-exynos-clock' of git://git.kernel.org/pub/scm/linu... (diff) | |
| parent | ep93xx: Remove unnecessary includes of ep93xx-regs.h (diff) | |
| download | linux-f4e2467bad53023589cbff18dd1ab6e0aa3f004c.tar.xz linux-f4e2467bad53023589cbff18dd1ab6e0aa3f004c.zip | |
Merge branch 'ep93xx-for-arm-soc' of git://github.com/RyanMallon/linux-2.6 into next/cleanup
* 'ep93xx-for-arm-soc' of git://github.com/RyanMallon/linux-2.6:
ep93xx: Remove unnecessary includes of ep93xx-regs.h
ep93xx: Move EP93XX_SYSCON defines to SoC private header
ep93xx: Move crunch code to mach-ep93xx directory
ep93xx: Make syscon access functions private to SoC
ep93xx: Configure GPIO ports in core code
ep93xx: Move peripheral defines to local SoC header
ep93xx: Convert the watchdog driver into a platform device.
ep93xx: Use ioremap for backlight driver
ep93xx: Move GPIO defines to gpio-ep93xx.h
ep93xx: Don't use system controller defines in audio drivers
ep93xx: Move PHYS_BASE defines to local SoC header file
(update to v3.3-rc7)
Conflicts:
arch/arm/mach-s3c2440/common.h
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-pl022.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c index 2f9cb43a2398..f37ad2271ad5 100644 --- a/drivers/spi/spi-pl022.c +++ b/drivers/spi/spi-pl022.c @@ -1083,7 +1083,7 @@ err_alloc_rx_sg: return -ENOMEM; } -static int __init pl022_dma_probe(struct pl022 *pl022) +static int __devinit pl022_dma_probe(struct pl022 *pl022) { dma_cap_mask_t mask; |