projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.infradead.org/users/dwmw2/solos-2.6
[cascardo/linux.git]
/
drivers
/
net
/
phy
/
lxt.c
diff --git
a/drivers/net/phy/lxt.c
b/drivers/net/phy/lxt.c
index
bef79e4
..
4cf3324
100644
(file)
--- a/
drivers/net/phy/lxt.c
+++ b/
drivers/net/phy/lxt.c
@@
-13,9
+13,7
@@
* option) any later version.
*
*/
* option) any later version.
*
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/kernel.h>
-#include <linux/sched.h>
#include <linux/string.h>
#include <linux/errno.h>
#include <linux/unistd.h>
#include <linux/string.h>
#include <linux/errno.h>
#include <linux/unistd.h>
@@
-123,9
+121,9
@@
static int lxt971_config_intr(struct phy_device *phydev)
}
static struct phy_driver lxt970_driver = {
}
static struct phy_driver lxt970_driver = {
- .phy_id = 0x
0781
0000,
+ .phy_id = 0x
7810
0000,
.name = "LXT970",
.name = "LXT970",
- .phy_id_mask = 0x
0fffffff
,
+ .phy_id_mask = 0x
fffffff0
,
.features = PHY_BASIC_FEATURES,
.flags = PHY_HAS_INTERRUPT,
.config_init = lxt970_config_init,
.features = PHY_BASIC_FEATURES,
.flags = PHY_HAS_INTERRUPT,
.config_init = lxt970_config_init,
@@
-137,9
+135,9
@@
static struct phy_driver lxt970_driver = {
};
static struct phy_driver lxt971_driver = {
};
static struct phy_driver lxt971_driver = {
- .phy_id = 0x00
01378e
,
+ .phy_id = 0x00
1378e0
,
.name = "LXT971",
.name = "LXT971",
- .phy_id_mask = 0x
0fffffff
,
+ .phy_id_mask = 0x
fffffff0
,
.features = PHY_BASIC_FEATURES,
.flags = PHY_HAS_INTERRUPT,
.config_aneg = genphy_config_aneg,
.features = PHY_BASIC_FEATURES,
.flags = PHY_HAS_INTERRUPT,
.config_aneg = genphy_config_aneg,