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 'master' into gfs2
[pandora-kernel.git]
/
drivers
/
net
/
phy
/
phy_device.c
diff --git
a/drivers/net/phy/phy_device.c
b/drivers/net/phy/phy_device.c
index
2d1ecfd
..
ecd3da1
100644
(file)
--- a/
drivers/net/phy/phy_device.c
+++ b/
drivers/net/phy/phy_device.c
@@
-522,7
+522,7
@@
EXPORT_SYMBOL(genphy_read_status);
static int genphy_config_init(struct phy_device *phydev)
{
-
u32
val;
+
int
val;
u32 features;
/* For now, I'll claim that the generic driver supports