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
Merge branches 'core-fixes-for-linus' and 'irq-fixes-for-linus' of git://git.kernel...
[pandora-kernel.git]
/
drivers
/
i2c
/
busses
/
i2c-ocores.c
diff --git
a/drivers/i2c/busses/i2c-ocores.c
b/drivers/i2c/busses/i2c-ocores.c
index
fee1a26
..
1b46a9d
100644
(file)
--- a/
drivers/i2c/busses/i2c-ocores.c
+++ b/
drivers/i2c/busses/i2c-ocores.c
@@
-49,7
+49,6
@@
#include <linux/init.h>
#include <linux/errno.h>
#include <linux/platform_device.h>
#include <linux/init.h>
#include <linux/errno.h>
#include <linux/platform_device.h>
-#include <linux/mfd/core.h>
#include <linux/i2c.h>
#include <linux/interrupt.h>
#include <linux/wait.h>
#include <linux/i2c.h>
#include <linux/interrupt.h>
#include <linux/wait.h>
@@
-306,7
+305,7
@@
static int __devinit ocores_i2c_probe(struct platform_device *pdev)
return -EIO;
}
return -EIO;
}
- pdata =
mfd_get_data(pdev)
;
+ pdata =
pdev->dev.platform_data
;
if (pdata) {
i2c->regstep = pdata->regstep;
i2c->clock_khz = pdata->clock_khz;
if (pdata) {
i2c->regstep = pdata->regstep;
i2c->clock_khz = pdata->clock_khz;