Merge remote branch 'kibi/master'

This commit is contained in:
Keith Packard 2011-02-24 18:59:07 -08:00
commit 8386159578

View File

@ -709,6 +709,6 @@ xf86SbusConfigureNewDev(void *busData, sbusDevicePtr sBus, GDevRec *GDev)
XNFasprintf(&GDev->busID, "SBUS:%s", promPath); XNFasprintf(&GDev->busID, "SBUS:%s", promPath);
free(promPath); free(promPath);
} else { } else {
XNFsprintf(&GDev->busID, "SBUS:fb%d", sBus->fbNum); XNFasprintf(&GDev->busID, "SBUS:fb%d", sBus->fbNum);
} }
} }