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 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...
[pandora-kernel.git]
/
drivers
/
i2c
/
busses
/
i2c-viapro.c
diff --git
a/drivers/i2c/busses/i2c-viapro.c
b/drivers/i2c/busses/i2c-viapro.c
index
d57292e
..
4c6fff5
100644
(file)
--- a/
drivers/i2c/busses/i2c-viapro.c
+++ b/
drivers/i2c/busses/i2c-viapro.c
@@
-51,7
+51,7
@@
#include <linux/i2c.h>
#include <linux/init.h>
#include <linux/acpi.h>
-#include <
asm
/io.h>
+#include <
linux
/io.h>
static struct pci_dev *vt596_pdev;