diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-09 05:23:45 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-09 05:23:45 +0400 |
| commit | 7d77696e924bf09d83d83354ce57aa11d3ad61de (patch) | |
| tree | f7da2babda1713ef293baa4ab840962d4a9594df | |
| parent | 42a6c7ef3b204ef9bfd0e5b65ccd8c67f4a6cedf (diff) | |
| parent | a5ab6291b1fc73e0dc71caf2eaa0de1de7b11aaa (diff) | |
| download | linux-7d77696e924bf09d83d83354ce57aa11d3ad61de.tar.xz | |
Merge tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6
Pull SPI section mismatch bug fix for v3.3-rc3 from Grant Likely:
"Minor fix for pl022_dma_probe() function which was put in the wrong
section."
* tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6:
Fix section mismatch in spi-pl022.c
| -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; |