Merge branch 'origin' into kconfig-for-1.3.1

Conflicts:

	drivers/Makefile

1 files changed, 1 insertions, 0 deletions

diff --git a/drivers/Makefile b/drivers/Makefile
index a81c8200720..480b3581f64 100755
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -108,6 +108,7 @@ COBJS-y += smc91111.o
 COBJS-y += tigon3.o
 COBJS-y += tsec.o
 COBJS-y += tsi108_eth.o
+COBJS-y += uli526x.o
 
 #
 # PCI/PCMCIA device drivers