From be56f36a9ef7bd74e0e84aaadd45797ae6c8793f Mon Sep 17 00:00:00 2001 From: Mark Einon Date: Wed, 31 Aug 2011 23:22:17 +0000 Subject: [PATCH] --- yaml --- r: 265740 b: refs/heads/master c: e8aaebc6b2a9c36dd9705adcb8f10d14b3d33f75 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/mii.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c462171326bd..637a233de70c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c44f7eb4c127be8bb8b160902845b88d489492e5 +refs/heads/master: e8aaebc6b2a9c36dd9705adcb8f10d14b3d33f75 diff --git a/trunk/include/linux/mii.h b/trunk/include/linux/mii.h index d9f77505d009..27748230aa69 100644 --- a/trunk/include/linux/mii.h +++ b/trunk/include/linux/mii.h @@ -39,12 +39,12 @@ #define BMCR_CTST 0x0080 /* Collision test */ #define BMCR_FULLDPLX 0x0100 /* Full duplex */ #define BMCR_ANRESTART 0x0200 /* Auto negotiation restart */ -#define BMCR_ISOLATE 0x0400 /* Disconnect DP83840 from MII */ -#define BMCR_PDOWN 0x0800 /* Powerdown the DP83840 */ +#define BMCR_ISOLATE 0x0400 /* Isolate data paths from MII */ +#define BMCR_PDOWN 0x0800 /* Enable low power state */ #define BMCR_ANENABLE 0x1000 /* Enable auto negotiation */ #define BMCR_SPEED100 0x2000 /* Select 100Mbps */ #define BMCR_LOOPBACK 0x4000 /* TXD loopback bits */ -#define BMCR_RESET 0x8000 /* Reset the DP83840 */ +#define BMCR_RESET 0x8000 /* Reset to default state */ /* Basic mode status register. */ #define BMSR_ERCAP 0x0001 /* Ext-reg capability */