Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/spi/spi-pl022.c

+1 −1
Original line number Diff line number Diff line
@@ -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;