Commit 7d77696e authored by Linus Torvalds's avatar Linus Torvalds

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
parents 42a6c7ef a5ab6291
...@@ -1083,7 +1083,7 @@ static int configure_dma(struct pl022 *pl022) ...@@ -1083,7 +1083,7 @@ static int configure_dma(struct pl022 *pl022)
return -ENOMEM; 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; dma_cap_mask_t mask;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment