Stefan Roese f2302d4430 Fix merge problems ...

Signed-off-by: Stefan Roese <sr@denx.de>

2008-08-06 14:05:38 +02:00

..

sk98lin

Big white-space cleanup.

2008-05-21 00:14:08 +02:00

3c589.c

net: Conditional COBJS inclusion of network drivers

2008-06-09 23:21:05 -07:00

3c589.h

Big white-space cleanup.

2008-05-21 00:14:08 +02:00

5701rls.c

drivers/net : move net drivers to drivers/net

2007-11-25 18:35:17 +01:00

5701rls.h

drivers/net : move net drivers to drivers/net

2007-11-25 18:35:17 +01:00

8390.h

drivers/net : move net drivers to drivers/net

2007-11-25 18:35:17 +01:00

ax88796.c

NE2000: Fix regresssion introduced by e710185aae90 on non AX88796

2008-04-28 22:26:36 -07:00

ax88796.h

NE2000: Fix regresssion introduced by e710185aae90 on non AX88796

2008-04-28 22:26:36 -07:00

bcm570x_autoneg.c

drivers/net : move net drivers to drivers/net

2007-11-25 18:35:17 +01:00

bcm570x_autoneg.h

drivers/net : move net drivers to drivers/net

2007-11-25 18:35:17 +01:00

bcm570x_bits.h

drivers/net : move net drivers to drivers/net

2007-11-25 18:35:17 +01:00

bcm570x_debug.h

drivers/net : move net drivers to drivers/net

2007-11-25 18:35:17 +01:00

bcm570x_lm.h

drivers/net : move net drivers to drivers/net

2007-11-25 18:35:17 +01:00

bcm570x_mm.h

drivers/net : move net drivers to drivers/net

2007-11-25 18:35:17 +01:00

bcm570x_queue.h

drivers/net : move net drivers to drivers/net

2007-11-25 18:35:17 +01:00

bcm570x.c

net: Conditional COBJS inclusion of network drivers

2008-06-09 23:21:05 -07:00

bfin_mac.c

Big white-space cleanup.

2008-05-21 00:14:08 +02:00

bfin_mac.h

net/Blackfin: move on-chip MAC driver into drivers/net/

2008-03-25 22:35:26 +01:00

cs8900.c

net: Conditional COBJS inclusion of network drivers

2008-06-09 23:21:05 -07:00

cs8900.h

minor cs8900 driver clean up

2008-04-28 22:22:34 -07:00

dc2114x.c

net: Conditional COBJS inclusion of network drivers

2008-06-09 23:21:05 -07:00

dm9000x.c

net: Conditional COBJS inclusion of network drivers

2008-06-09 23:21:05 -07:00

dm9000x.h

drivers/net : move net drivers to drivers/net

2007-11-25 18:35:17 +01:00

e1000.c

Fix merge problems

2008-08-06 14:05:38 +02:00

e1000.h

e1000: add support for 82545GM 64bit PCI-X copper variant

2008-07-10 00:52:48 +02:00

eepro100.c

net: Conditional COBJS inclusion of network drivers

2008-06-09 23:21:05 -07:00

enc28j60.c

net: Conditional COBJS inclusion of network drivers

2008-06-09 23:21:05 -07:00

fsl_mcdmafec.c

net: Conditional COBJS inclusion of network drivers

2008-06-09 23:21:05 -07:00

greth.c

SPARC/LEON3: Added GRETH Ethernet 10/100/1000 driver.

2008-03-30 00:33:28 -04:00

greth.h

SPARC/LEON3: Added GRETH Ethernet 10/100/1000 driver.

2008-03-30 00:33:28 -04:00

inca-ip_sw.c

Merge branch 'master' of git://www.denx.de/git/u-boot-mips

2008-06-11 22:48:09 +02:00

ks8695eth.c

net: Conditional COBJS inclusion of network drivers

2008-06-09 23:21:05 -07:00

lan91c96.c

net: Conditional COBJS inclusion of network drivers

2008-06-09 23:21:05 -07:00

lan91c96.h

Big white-space cleanup.

2008-05-21 00:14:08 +02:00

macb.c

net: Conditional COBJS inclusion of network drivers

2008-06-09 23:21:05 -07:00

macb.h

AT91CAP9 support : MACB changes

2008-02-14 09:37:58 +00:00

Makefile

net: sh: Renesas SH7763 Ethernet device support

2008-07-06 23:32:04 -07:00

mcffec.c

net: Conditional COBJS inclusion of network drivers

2008-06-09 23:21:05 -07:00

natsemi.c

net: Conditional COBJS inclusion of network drivers

2008-06-09 23:21:05 -07:00

ne2000_base.h

NE2000: Fix regresssion introduced by e710185aae90 on non AX88796

2008-04-28 22:26:36 -07:00

ne2000.c

net: ne2000: Move dev_addr variable from grobal to local.

2008-07-06 00:23:44 -07:00

ne2000.h

NE2000: Fix regresssion introduced by e710185aae90 on non AX88796

2008-04-28 22:26:36 -07:00

netarm_eth.c

net: Conditional COBJS inclusion of network drivers

2008-06-09 23:21:05 -07:00

netarm_eth.h

drivers/net : move net drivers to drivers/net

2007-11-25 18:35:17 +01:00

netconsole.c

net: Conditional COBJS inclusion of network drivers

2008-06-09 23:21:05 -07:00

nicext.h

Big white-space cleanup.

2008-05-21 00:14:08 +02:00

ns7520_eth.c

Remove duplicate definitions in include/lxt971a.h.

2008-07-06 23:44:34 -07:00

ns8382x.c

Fix some more print() format errors.

2008-07-10 13:16:09 +02:00

ns9750_eth.c

Remove duplicate definitions in include/lxt971a.h.

2008-07-06 23:44:34 -07:00

pcnet.c

net: Conditional COBJS inclusion of network drivers

2008-06-09 23:21:05 -07:00

plb2800_eth.c

net: Conditional COBJS inclusion of network drivers

2008-06-09 23:21:05 -07:00

rtl8019.c

net: Conditional COBJS inclusion of network drivers

2008-06-09 23:21:05 -07:00

rtl8019.h

Big white-space cleanup.

2008-05-21 00:14:08 +02:00

rtl8139.c

net: Conditional COBJS inclusion of network drivers

2008-06-09 23:21:05 -07:00

rtl8169.c

Fix some more print() format errors.

2008-07-10 13:16:09 +02:00

s3c4510b_eth.c

net: Conditional COBJS inclusion of network drivers

2008-06-09 23:21:05 -07:00

s3c4510b_eth.h

s3c4510b_eth: fix 'packed' attribute ignored for fields of MACFrame

2008-04-17 13:45:02 -07:00

sh_eth.c

net: sh: Renesas SH7763 Ethernet device support

2008-07-06 23:32:04 -07:00

sh_eth.h

net: sh: Renesas SH7763 Ethernet device support

2008-07-06 23:32:04 -07:00

smc911x.c

Fix some more printf() format issues.

2008-07-13 16:55:00 +02:00

smc91111.c

net: Conditional COBJS inclusion of network drivers

2008-06-09 23:21:05 -07:00

smc91111.h

Big white-space cleanup.

2008-05-21 00:14:08 +02:00

tigon3.c

net: Conditional COBJS inclusion of network drivers

2008-06-09 23:21:05 -07:00

tigon3.h

Big white-space cleanup.

2008-05-21 00:14:08 +02:00

tsec.c

net: Conditional COBJS inclusion of network drivers

2008-06-09 23:21:05 -07:00

tsec.h

Big white-space cleanup.

2008-05-21 00:14:08 +02:00

tsi108_eth.c

Fix some more printf() format issues.

2008-07-11 22:56:11 +02:00

uli526x.c

Fix some more print() format errors.

2008-07-11 01:16:00 +02:00

vsc7385.c

net: Conditional COBJS inclusion of network drivers

2008-06-09 23:21:05 -07:00

xilinx_emac.c

microblaze: add Emac ethernet driver

2008-04-08 15:38:14 +02:00

xilinx_emaclite.c

microblaze: add Emaclite ethernet driver

2008-04-08 15:38:14 +02:00