git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
spi doesn't need class_device
[pandora-kernel.git]
/
drivers
/
mmc
/
host
/
mmc_spi.c
diff --git
a/drivers/mmc/host/mmc_spi.c
b/drivers/mmc/host/mmc_spi.c
index
f30327b
..
71b986b
100644
(file)
--- a/
drivers/mmc/host/mmc_spi.c
+++ b/
drivers/mmc/host/mmc_spi.c
@@
-26,7
+26,7
@@
*/
#include <linux/hrtimer.h>
#include <linux/delay.h>
*/
#include <linux/hrtimer.h>
#include <linux/delay.h>
-#include <linux/b
lkdev
.h>
+#include <linux/b
io
.h>
#include <linux/dma-mapping.h>
#include <linux/crc7.h>
#include <linux/crc-itu-t.h>
#include <linux/dma-mapping.h>
#include <linux/crc7.h>
#include <linux/crc-itu-t.h>
@@
-1280,8
+1280,8
@@
static int mmc_spi_probe(struct spi_device *spi)
if (!host->data)
goto fail_nobuf1;
if (!host->data)
goto fail_nobuf1;
- if (spi->master->
cdev.dev
->dma_mask) {
- struct device *dev = spi->master->
cdev.dev
;
+ if (spi->master->
dev.parent
->dma_mask) {
+ struct device *dev = spi->master->
dev.parent
;
host->dma_dev = dev;
host->ones_dma = dma_map_single(dev, ones,
host->dma_dev = dev;
host->ones_dma = dma_map_single(dev, ones,