| commit | efe33035acd5f7c13963a4d52e5aac1b68612ae4 | [log] [tgz] |
|---|---|---|
| author | Grant Likely <grant.likely@secretlab.ca> | Fri Nov 16 21:01:19 2007 -0700 |
| committer | Grant Likely <grant.likely@secretlab.ca> | Fri Nov 16 21:01:19 2007 -0700 |
| tree | 37d6ccca1c82953ae4c41451cb3ec5fe53e2dc3c | |
| parent | 4d4faae65e115e327425cd514c1a35146a85166b [diff] [blame] | |
| parent | 5947f6999aafa7c54c1390983d264a8463dfea8e [diff] [blame] |
Merge branch 'origin' into kconfig-for-1.3.1 Conflicts: drivers/Makefile
diff --git a/drivers/Makefile b/drivers/Makefile index a81c820..480b358 100755 --- a/drivers/Makefile +++ b/drivers/Makefile
@@ -108,6 +108,7 @@ COBJS-y += tigon3.o COBJS-y += tsec.o COBJS-y += tsi108_eth.o +COBJS-y += uli526x.o # # PCI/PCMCIA device drivers