summaryrefslogtreecommitdiffstats
path: root/examples/standalone
diff options
context:
space:
mode:
authorBen Warren <biggerbadderben@gmail.com>2010-01-18 11:35:31 -0800
committerWolfgang Denk <wd@denx.de>2010-01-19 00:05:53 +0100
commitb40e2320c440c5082020e5036a0cb8d4ed1b3d7d (patch)
tree6f8fd8bfe0155a1212da881c7bbae2f9b5efcd20 /examples/standalone
parent2a9987935e3cdb61e7550c87cbc9f500a54f672d (diff)
downloadblackbird-obmc-uboot-b40e2320c440c5082020e5036a0cb8d4ed1b3d7d.tar.gz
blackbird-obmc-uboot-b40e2320c440c5082020e5036a0cb8d4ed1b3d7d.zip
Fix breakage in SMC EEPROM standalone applications
Commit 6a45e384955262882375a2785426dc65aeb636c4 (Make getenv_IPaddr() global) inadvertently added ' #include "net.h" ' to the standalone programs, creating duplicate definitions of 'struct eth_device'. This patch removes the local definitions and removes other code that breaks due to the change in definition. Signed-off-by: Ben Warren <biggerbadderben@gmail.com> Acked-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'examples/standalone')
-rw-r--r--examples/standalone/smc91111_eeprom.c2
-rw-r--r--examples/standalone/smc911x_eeprom.c8
2 files changed, 0 insertions, 10 deletions
diff --git a/examples/standalone/smc91111_eeprom.c b/examples/standalone/smc91111_eeprom.c
index 428ea7bd2f..9145763e30 100644
--- a/examples/standalone/smc91111_eeprom.c
+++ b/examples/standalone/smc91111_eeprom.c
@@ -29,8 +29,6 @@
#include <common.h>
#include <exports.h>
-/* the smc91111.h gets base addr through eth_device' iobase */
-struct eth_device { unsigned long iobase; };
#include "../drivers/net/smc91111.h"
#ifndef SMC91111_EEPROM_INIT
diff --git a/examples/standalone/smc911x_eeprom.c b/examples/standalone/smc911x_eeprom.c
index fff3123464..104047f5a5 100644
--- a/examples/standalone/smc911x_eeprom.c
+++ b/examples/standalone/smc911x_eeprom.c
@@ -16,13 +16,6 @@
#include <common.h>
#include <exports.h>
-
-/* the smc911x.h gets base addr through eth_device' iobase */
-struct eth_device {
- const char *name;
- unsigned long iobase;
- void *priv;
-};
#include "../drivers/net/smc911x.h"
/**
@@ -324,7 +317,6 @@ int smc911x_eeprom(int argc, char *argv[])
{
/* Avoid initializing on stack as gcc likes to call memset() */
struct eth_device dev;
- dev.name = __func__;
dev.iobase = CONFIG_SMC911X_BASE;
/* Print the ABI version */
OpenPOWER on IntegriCloud