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 branch 'for-2.6.35' of git://linux-nfs.org/~bfields/linux
[pandora-kernel.git]
/
drivers
/
i2c
/
busses
/
i2c-versatile.c
diff --git
a/drivers/i2c/busses/i2c-versatile.c
b/drivers/i2c/busses/i2c-versatile.c
index
5c47383
..
6055601
100644
(file)
--- a/
drivers/i2c/busses/i2c-versatile.c
+++ b/
drivers/i2c/busses/i2c-versatile.c
@@
-15,8
+15,7
@@
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
-
-#include <asm/io.h>
+#include <linux/io.h>
#define I2C_CONTROL 0x00
#define I2C_CONTROLS 0x00