diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-11-23 21:23:45 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-11-23 21:23:45 +0100 |
| commit | fdbe8b9a2d1858ba35dd6214315563ad44d4a0e3 (patch) | |
| tree | 98c39a0594ef02e08d5842cfff1f1d6bcc5a8eda /drivers/net/lan91c96.c | |
| parent | bd0f5ca806c73f9e1ef4a2a0416233ab7e257df9 (diff) | |
| parent | d780e74fc3abe6a8b9a01357720c15d974d83dae (diff) | |
| download | blackbird-obmc-uboot-fdbe8b9a2d1858ba35dd6214315563ad44d4a0e3.tar.gz blackbird-obmc-uboot-fdbe8b9a2d1858ba35dd6214315563ad44d4a0e3.zip | |
Merge branch 'hs@denx.de' of git://git.denx.de/u-boot-staging
* 'hs@denx.de' of git://git.denx.de/u-boot-staging:
drivers/net/dnet.c: Fix GCC 4.6 warnings
board/xaeniax/flash.c: Fix GCC 4.6 warnings
net/bootp.c: Fix GCC 4.6 warning
common/cmd_bootm.c: Fix GCC 4.6 warnings
board/mx1ads/mx1ads.c: Fix GCC 4.6 warning
board/mx1ads/syncflash.c: Fix GCC 4.6 warnings
board/lubbock/flash.c: Fix GCC 4.6 warnings
drivers/net/cs8900.c: Fix GCC 4.6 warning
arch/arm/cpu/arm926ejs/omap/cpuinfo.c: Fix GCC 4.6 warnings
drivers/net/lan91c96.c: Fix GCC 4.6 warning
board/ronetix/pm9263/pm9263.c: Fix GCC 4.6 warning
drivers/mtd/onenand/samsung.c: Fix GCC 4.6 warning
drivers/usb/musb/musb_hcd.c: Fix GCC 4.6 warning
Diffstat (limited to 'drivers/net/lan91c96.c')
| -rw-r--r-- | drivers/net/lan91c96.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/lan91c96.c b/drivers/net/lan91c96.c index 883f3a7c5d..24b28da249 100644 --- a/drivers/net/lan91c96.c +++ b/drivers/net/lan91c96.c @@ -63,6 +63,7 @@ #include <malloc.h> #include "lan91c96.h" #include <net.h> +#include <linux/compiler.h> /*------------------------------------------------------------------------ * @@ -154,7 +155,7 @@ static void smc_set_mac_addr(const unsigned char *addr) ***********************************************/ void dump_memory_info(struct eth_device *dev) { - word mem_info; + __maybe_unused word mem_info; word old_bank; old_bank = SMC_inw(dev, LAN91C96_BANK_SELECT) & 0xF; @@ -317,7 +318,6 @@ static int smc_send_packet(struct eth_device *dev, volatile void *packet, int packet_length) { byte packet_no; - unsigned long ioaddr; byte *buf; int length; int numPages; @@ -381,9 +381,6 @@ static int smc_send_packet(struct eth_device *dev, volatile void *packet, dev->name, try); /* I can send the packet now.. */ - - ioaddr = dev->iobase; - buf = (byte *) packet; /* If I get here, I _know_ there is a packet slot waiting for me */ |
