aboutsummaryrefslogtreecommitdiff
path: root/drivers/Makefile
diff options
context:
space:
mode:
authorGrant Likely2007-11-16 21:01:19 -0700
committerGrant Likely2007-11-16 21:01:19 -0700
commitefe33035acd5f7c13963a4d52e5aac1b68612ae4 (patch)
tree37d6ccca1c82953ae4c41451cb3ec5fe53e2dc3c /drivers/Makefile
parent4d4faae65e115e327425cd514c1a35146a85166b (diff)
parent5947f6999aafa7c54c1390983d264a8463dfea8e (diff)
Merge branch 'origin' into kconfig-for-1.3.1
Conflicts: drivers/Makefile
Diffstat (limited to 'drivers/Makefile')
-rwxr-xr-xdrivers/Makefile1
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