diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-10-20 23:04:42 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-10-20 23:04:42 +0200 |
| commit | 9fa48022e5883a0826a98979c0156f6ac5a0ef79 (patch) | |
| tree | e854c807526ce8b7215446fc34f52832fd0bcc54 /common/miiphybb.c | |
| parent | 34a7ceeff449be015a37d0e3f3178ca313618349 (diff) | |
| parent | ba999c531ed16ec749b2b6f4b0133cee38842b91 (diff) | |
| download | u-boot-imx-9fa48022e5883a0826a98979c0156f6ac5a0ef79.zip u-boot-imx-9fa48022e5883a0826a98979c0156f6ac5a0ef79.tar.gz u-boot-imx-9fa48022e5883a0826a98979c0156f6ac5a0ef79.tar.bz2 | |
Merge with /home/wd/git/u-boot/master
Diffstat (limited to 'common/miiphybb.c')
| -rw-r--r-- | common/miiphybb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/miiphybb.c b/common/miiphybb.c index adb697c..537c15d 100644 --- a/common/miiphybb.c +++ b/common/miiphybb.c @@ -41,7 +41,7 @@ static void miiphy_pre (char read, unsigned char addr, unsigned char reg) { int j; /* counter */ -#ifndef CONFIG_EP8248 +#if !(defined(CONFIG_EP8248) || defined(CONFIG_EP82XXM)) volatile ioport_t *iop = ioport_addr ((immap_t *) CFG_IMMR, MDIO_PORT); #endif @@ -126,7 +126,7 @@ int bb_miiphy_read (char *devname, unsigned char addr, { short rdreg; /* register working value */ int j; /* counter */ -#ifndef CONFIG_EP8248 +#if !(defined(CONFIG_EP8248) || defined(CONFIG_EP82XXM)) volatile ioport_t *iop = ioport_addr ((immap_t *) CFG_IMMR, MDIO_PORT); #endif @@ -193,7 +193,7 @@ int bb_miiphy_write (char *devname, unsigned char addr, unsigned char reg, unsigned short value) { int j; /* counter */ -#ifndef CONFIG_EP8248 +#if !(defined(CONFIG_EP8248) || defined(CONFIG_EP82XXM)) volatile ioport_t *iop = ioport_addr ((immap_t *) CFG_IMMR, MDIO_PORT); #endif |