Update to support new combined drivers.
Authored by: wackston 2001-01-26
Parent: [r260]
Child: [r262]