diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-07-29 12:03:40 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-07-29 12:03:40 +0200 |
| commit | ffcf536cef0fe90bb0b7340b82492ce0a54a0dc6 (patch) | |
| tree | dbffc92a48a327937a5ec415064c791d7147d37a /include | |
| parent | 8f24f965e117444c1b253c14621d80fcaf31554c (diff) | |
| parent | 02b1926f5aabf2c8043de576ae159d63e35961f1 (diff) | |
| download | barebox-ffcf536cef0fe90bb0b7340b82492ce0a54a0dc6.tar.gz barebox-ffcf536cef0fe90bb0b7340b82492ce0a54a0dc6.tar.xz | |
Merge branch 'pu' into next
Diffstat (limited to 'include')
| -rw-r--r-- | include/driver.h | 2 | ||||
| -rw-r--r-- | include/net.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/include/driver.h b/include/driver.h index af34803936..9a0b102da2 100644 --- a/include/driver.h +++ b/include/driver.h @@ -27,7 +27,7 @@ #include <linux/ioport.h> #define MAX_DRIVER_NAME 32 -#define FORMAT_DRIVER_MANE_ID "%s%d" +#define FORMAT_DRIVER_NAME_ID "%s%d" #include <param.h> diff --git a/include/net.h b/include/net.h index 31bf6a23fc..7ac1c33412 100644 --- a/include/net.h +++ b/include/net.h @@ -28,8 +28,6 @@ struct device_d; struct eth_device { - int iobase; - int state; int active; int (*init) (struct eth_device*); |