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 'drm-radeon-lockup' into drm-core-next
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
phy
/
icplus.c
diff --git
a/drivers/net/phy/icplus.c
b/drivers/net/phy/icplus.c
index af3f1f2a9f8721aafe0dbfff30859967b43717f9..904208b95d4b81221fa96271492ee6fd85707cce 100644
(file)
--- a/
drivers/net/phy/icplus.c
+++ b/
drivers/net/phy/icplus.c
@@
-13,7
+13,6
@@
#include <linux/string.h>
#include <linux/errno.h>
#include <linux/unistd.h>
-#include <linux/slab.h>
#include <linux/interrupt.h>
#include <linux/init.h>
#include <linux/delay.h>