diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2011-01-19 03:36:40 -0600 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-01-25 21:15:10 +0100 |
| commit | 2b21ec92afd8f1809d55beb6044d9faabb4acae1 (patch) | |
| tree | 4dfa71f45181491c2279a3cc6af860c9a90d67b8 /drivers/qe/uec_phy.h | |
| parent | 5aebe3b07254d9ec8f7ae23a4525a6c535a7f858 (diff) | |
| download | talos-obmc-uboot-2b21ec92afd8f1809d55beb6044d9faabb4acae1.tar.gz talos-obmc-uboot-2b21ec92afd8f1809d55beb6044d9faabb4acae1.zip | |
UEC: Fix compiler warnings introduced by linux/mii.h change
Patch 8ef583a0 [miiphy: convert to linux/mii.h] introduced the following
compiler warnings in the uec ethernet driver:
In file included from /local/home/galak/git/u-boot-85xx/include/miiphy.h:37:0,
from uec.c:32:
/local/home/galak/git/u-boot-85xx/include/linux/mii.h:133:0: warning: "LPA_1000FULL" redefined
uec_phy.h:34:0: note: this is the location of the previous definition
/local/home/galak/git/u-boot-85xx/include/linux/mii.h:134:0: warning: "LPA_1000HALF" redefined
uec_phy.h:35:0: note: this is the location of the previous definition
In file included from /local/home/galak/git/u-boot-85xx/include/miiphy.h:37:0,
from uec_phy.c:27:
/local/home/galak/git/u-boot-85xx/include/linux/mii.h:133:0: warning: "LPA_1000FULL" redefined
uec_phy.h:34:0: note: this is the location of the previous definition
/local/home/galak/git/u-boot-85xx/include/linux/mii.h:134:0: warning: "LPA_1000HALF" redefined
uec_phy.h:35:0: note: this is the location of the previous definition
Fix them be removing the duplication in the uec code and utlizing the
linux/mii.h version instead.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'drivers/qe/uec_phy.h')
| -rw-r--r-- | drivers/qe/uec_phy.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/qe/uec_phy.h b/drivers/qe/uec_phy.h index 929d9bdd7d..f924b2a14d 100644 --- a/drivers/qe/uec_phy.h +++ b/drivers/qe/uec_phy.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005 Freescale Semiconductor, Inc. + * Copyright (C) 2005, 2011 Freescale Semiconductor, Inc. * * Author: Shlomi Gridish <gridish@freescale.com> * @@ -24,16 +24,6 @@ #define UGETH_AN_TIMEOUT 2000 -/* 1000BT control (Marvell & BCM54xx at least) */ -#define MII_1000BASETCONTROL 0x09 -#define MII_1000BASETCONTROL_FULLDUPLEXCAP 0x0200 -#define MII_1000BASETCONTROL_HALFDUPLEXCAP 0x0100 - -/* 1000BT status */ -#define MII_1000BASETSTATUS 0x0a -#define LPA_1000FULL 0x0400 -#define LPA_1000HALF 0x0200 - /* Cicada Extended Control Register 1 */ #define MII_CIS8201_EXT_CON1 0x17 #define MII_CIS8201_EXTCON1_INIT 0x0000 |
