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 'regmap-linus' into regmap-next
[pandora-kernel.git]
/
drivers
/
net
/
natsemi.c
diff --git
a/drivers/net/natsemi.c
b/drivers/net/natsemi.c
index
60f46bc
..
2962cc6
100644
(file)
--- a/
drivers/net/natsemi.c
+++ b/
drivers/net/natsemi.c
@@
-1382,7
+1382,7
@@
static int find_mii(struct net_device *dev)
/* WCSR bits [0:4] [9:10] */
#define WCSR_RESET_SAVE 0x61f
/* RFCR bits [20] [22] [27:31] */
/* WCSR bits [0:4] [9:10] */
#define WCSR_RESET_SAVE 0x61f
/* RFCR bits [20] [22] [27:31] */
-#define RFCR_RESET_SAVE 0xf8500000
;
+#define RFCR_RESET_SAVE 0xf8500000
static void natsemi_reset(struct net_device *dev)
{
static void natsemi_reset(struct net_device *dev)
{
@@
-2920,7
+2920,7
@@
static int netdev_set_ecmd(struct net_device *dev, struct ethtool_cmd *ecmd)
/*
* If we're ignoring the PHY then autoneg and the internal
/*
* If we're ignoring the PHY then autoneg and the internal
- * transc
ie
ver are really not going to work so don't let the
+ * transc
ei
ver are really not going to work so don't let the
* user select them.
*/
if (np->ignore_phy && (ecmd->autoneg == AUTONEG_ENABLE ||
* user select them.
*/
if (np->ignore_phy && (ecmd->autoneg == AUTONEG_ENABLE ||