diff options
| author | Minkyu Kang <mk7.kang@samsung.com> | 2009-11-10 08:44:30 +0900 |
|---|---|---|
| committer | Minkyu Kang <mk7.kang@samsung.com> | 2009-11-10 08:44:30 +0900 |
| commit | b6d8992cbbe5f04c11f7e6e09c09ae1a031d8720 (patch) | |
| tree | 38d607f78f33bcd41d8da448f4da7d5c220b4f93 /drivers/net | |
| parent | f9000d975b5f2550defd5fe5b57392a72fc77201 (diff) | |
| parent | b91b8f74fe9ded18344c3d03080a4abc07254502 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/phy/miiphybb.c | 10 | ||||
| -rw-r--r-- | drivers/net/smc911x.c | 2 | ||||
| -rw-r--r-- | drivers/net/smc911x.h | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/drivers/net/phy/miiphybb.c b/drivers/net/phy/miiphybb.c index 44c45fa66b4..2768c7584e2 100644 --- a/drivers/net/phy/miiphybb.c +++ b/drivers/net/phy/miiphybb.c @@ -119,7 +119,7 @@ struct bb_miiphy_bus bb_miiphy_buses[] = { }; int bb_miiphy_buses_num = sizeof(bb_miiphy_buses) / - sizeof(bb_miiphy_buses[0]); + sizeof(bb_miiphy_buses[0]); #endif void bb_miiphy_init(void) @@ -167,7 +167,7 @@ static inline struct bb_miiphy_bus *bb_miiphy_getbus(char *devname) * and write). */ static void miiphy_pre(struct bb_miiphy_bus *bus, char read, - unsigned char addr, unsigned char reg) + unsigned char addr, unsigned char reg) { int j; @@ -247,7 +247,7 @@ static void miiphy_pre(struct bb_miiphy_bus *bus, char read, * 0 on success */ int bb_miiphy_read(char *devname, unsigned char addr, - unsigned char reg, unsigned short *value) + unsigned char reg, unsigned short *value) { short rdreg; /* register working value */ int v; @@ -328,7 +328,7 @@ int bb_miiphy_read(char *devname, unsigned char addr, * 0 on success */ int bb_miiphy_write (char *devname, unsigned char addr, - unsigned char reg, unsigned short value) + unsigned char reg, unsigned short value) { struct bb_miiphy_bus *bus; int j; /* counter */ @@ -377,4 +377,4 @@ int bb_miiphy_write (char *devname, unsigned char addr, bus->delay(bus); return 0; -}
\ No newline at end of file +} diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index 48e08c06c9c..613d9028f0e 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c @@ -148,7 +148,7 @@ static int smc911x_init(struct eth_device *dev, bd_t * bd) { struct chip_id *id = dev->priv; - printf(DRIVERNAME ": detected %s controller\n", id->name); + printf(DRIVERNAME ": detected %s controller\n", id->name); smc911x_reset(dev); diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h index d5bca63d035..05e007c6de2 100644 --- a/drivers/net/smc911x.h +++ b/drivers/net/smc911x.h @@ -393,6 +393,7 @@ static inline void smc911x_reg_write(struct eth_device *dev, #define CHIP_9216 0x116a #define CHIP_9217 0x117a #define CHIP_9218 0x118a +#define CHIP_9220 0x9220 #define CHIP_9221 0x9221 struct chip_id { @@ -410,6 +411,7 @@ static const struct chip_id chip_ids[] = { { CHIP_9216, "LAN9216" }, { CHIP_9217, "LAN9217" }, { CHIP_9218, "LAN9218" }, + { CHIP_9220, "LAN9220" }, { CHIP_9221, "LAN9221" }, { 0, NULL }, }; |