Skip to content
Snippets Groups Projects
Commit b40e2320 authored by Ben Warren's avatar Ben Warren Committed by Wolfgang Denk
Browse files

Fix breakage in SMC EEPROM standalone applications


Commit 6a45e384 (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: default avatarBen Warren <biggerbadderben@gmail.com>
Acked-by: default avatarMike Frysinger <vapier@gentoo.org>
parent 2a998793
No related merge requests found
......@@ -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
......
......@@ -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 */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment