git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc
[sfrench/cifs-2.6.git]
/
drivers
/
i2c
/
busses
/
scx200_acb.c
diff --git
a/drivers/i2c/busses/scx200_acb.c
b/drivers/i2c/busses/scx200_acb.c
index cf994bd01d9c2ef34cf0f964578d4c68db12e21a..684395b6f3e2dc5af4343074017f47c27ad9f564 100644
(file)
--- a/
drivers/i2c/busses/scx200_acb.c
+++ b/
drivers/i2c/busses/scx200_acb.c
@@
-31,6
+31,7
@@
#include <linux/pci.h>
#include <linux/delay.h>
#include <linux/mutex.h>
+#include <linux/slab.h>
#include <asm/io.h>
#include <linux/scx200.h>