diff options
author | Wolfgang Denk <wd@denx.de> | 2008-09-09 02:24:51 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2008-09-09 02:24:51 +0200 |
commit | ab00e7a23e088505b22cba7b84145806129b83bf (patch) | |
tree | 5acdfb4c2b87058d132dc8fe9fb81d394cb034bd /include/configs/PIP405.h | |
parent | 4d2ae70e8c31c22e5710df5ff236b5565ea2cf2c (diff) | |
parent | 5ff889349d2ace13f10c9335e09365fcec8247cc (diff) |
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Conflicts:
Makefile
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include/configs/PIP405.h')
-rw-r--r-- | include/configs/PIP405.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h index 2ceda001cab..86ea6c69b93 100644 --- a/include/configs/PIP405.h +++ b/include/configs/PIP405.h @@ -281,7 +281,6 @@ ***********************************************************/ #define CONFIG_MII 1 /* MII PHY management */ #define CONFIG_PHY_ADDR 1 /* PHY address */ -#define CONFIG_CS8952_PHY 1 /* its a CS8952 PHY */ /************************************************************ * RTC ***********************************************************/ |