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 git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
[pandora-kernel.git]
/
drivers
/
i2c
/
busses
/
i2c-pca-platform.c
diff --git
a/drivers/i2c/busses/i2c-pca-platform.c
b/drivers/i2c/busses/i2c-pca-platform.c
index
5b2213d
..
ef5c784
100644
(file)
--- a/
drivers/i2c/busses/i2c-pca-platform.c
+++ b/
drivers/i2c/busses/i2c-pca-platform.c
@@
-23,9
+23,9
@@
#include <linux/i2c-algo-pca.h>
#include <linux/i2c-pca-platform.h>
#include <linux/gpio.h>
+#include <linux/io.h>
#include <asm/irq.h>
-#include <asm/io.h>
struct i2c_pca_pf_data {
void __iomem *reg_base;