projects
/
~shefty
/
rdma-dev.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux
[~shefty/rdma-dev.git]
/
drivers
/
i2c
/
busses
/
i2c-davinci.c
diff --git
a/drivers/i2c/busses/i2c-davinci.c
b/drivers/i2c/busses/i2c-davinci.c
index 85ce548ff1526672fe383c663e97a75814704ce7..6a0a5531944994803b94cbbe95b8badf7bdbb42c 100644
(file)
--- a/
drivers/i2c/busses/i2c-davinci.c
+++ b/
drivers/i2c/busses/i2c-davinci.c
@@
-42,7
+42,7
@@
#include <linux/of_device.h>
#include <mach/hardware.h>
-#include <
mach/i2c
.h>
+#include <
linux/platform_data/i2c-davinci
.h>
/* ----- global defines ----------------------------------------------- */