summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfgang Denk <wd@fifi.denx.de>2006-08-14 21:18:21 +0200
committerWolfgang Denk <wd@fifi.denx.de>2006-08-14 21:18:21 +0200
commitd689e3462c2ef39f8760051cf9260a8a52b77b25 (patch)
treeb1d76c43193d870ee44fca08fc0350946e906a20
parentc72d9c528517e629e146ca9ce101a4888c45fac8 (diff)
downloadblackbird-obmc-uboot-d689e3462c2ef39f8760051cf9260a8a52b77b25.tar.gz
blackbird-obmc-uboot-d689e3462c2ef39f8760051cf9260a8a52b77b25.zip
Fix drivers/dm9000.c when configured in 32 bit mode.
Patch by Eric Benard, 17 Nov 2005
-rw-r--r--CHANGELOG3
-rw-r--r--drivers/dm9000x.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 24499c5621..2247a24af4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
Changes since U-Boot 1.1.4:
======================================================================
+* Fix drivers/dm9000.c when configured in 32 bit mode.
+ Patch by Eric Benard, 17 Nov 2005
+
* Fix control-c handing in CONFIG_CMDLINE_EDITING
Properly pass break code back from readline.
Patch by Roger Blofeld, 31 Jul 2006
diff --git a/drivers/dm9000x.c b/drivers/dm9000x.c
index 0e475d4723..687707627e 100644
--- a/drivers/dm9000x.c
+++ b/drivers/dm9000x.c
@@ -436,6 +436,9 @@ eth_rx(void)
u8 rxbyte, *rdptr = (u8 *) NetRxPackets[0];
u16 RxStatus, RxLen = 0;
u32 tmplen, i;
+#ifdef CONFIG_DM9000_USE_32BIT
+ u32 tmpdata;
+#endif
/* Check packet ready or not */
DM9000_ior(DM9000_MRCMDX); /* Dummy read */
OpenPOWER on IntegriCloud