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 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
[pandora-kernel.git]
/
drivers
/
usb
/
net
/
rtl8150.c
diff --git
a/drivers/usb/net/rtl8150.c
b/drivers/usb/net/rtl8150.c
index
e0eecda
..
ea153dc
100644
(file)
--- a/
drivers/usb/net/rtl8150.c
+++ b/
drivers/usb/net/rtl8150.c
@@
-6,7
+6,6
@@
* version 2 as published by the Free Software Foundation.
*/
* version 2 as published by the Free Software Foundation.
*/
-#include <linux/sched.h>
#include <linux/init.h>
#include <linux/signal.h>
#include <linux/slab.h>
#include <linux/init.h>
#include <linux/signal.h>
#include <linux/slab.h>
@@
-284,7
+283,8
@@
static int write_mii_word(rtl8150_t * dev, u8 phy, __u8 indx, u16 reg)
u8 data[3], tmp;
data[0] = phy;
u8 data[3], tmp;
data[0] = phy;
- *(data + 1) = cpu_to_le16p(®);
+ data[1] = reg & 0xff;
+ data[2] = (reg >> 8) & 0xff;
tmp = indx | PHY_WRITE | PHY_GO;
i = 0;
tmp = indx | PHY_WRITE | PHY_GO;
i = 0;