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-amd8111.c
diff --git
a/drivers/i2c/busses/i2c-amd8111.c
b/drivers/i2c/busses/i2c-amd8111.c
index
2fbef27
..
af1e5e2
100644
(file)
--- a/
drivers/i2c/busses/i2c-amd8111.c
+++ b/
drivers/i2c/busses/i2c-amd8111.c
@@
-18,7
+18,7
@@
#include <linux/delay.h>
#include <linux/acpi.h>
#include <linux/slab.h>
-#include <
asm
/io.h>
+#include <
linux
/io.h>
MODULE_LICENSE("GPL");
MODULE_AUTHOR ("Vojtech Pavlik <vojtech@suse.cz>");