Merge remote branch 'whot/for-keith'

This commit is contained in:
Keith Packard 2011-02-18 12:20:26 -08:00
commit 816d67de2b
9 changed files with 75 additions and 31 deletions

View file

@ -808,7 +808,7 @@ InitInput(int argc, char **argv)
GetEventList(&xf86Events);
/* Call the PreInit function for each input device instance. */
/* Initialize all configured input devices */
for (pDev = xf86ConfigLayout.inputs; pDev && *pDev; pDev++) {
/* Replace obsolete keyboard driver with kbd */
if (!xf86NameCmp((*pDev)->driver, "keyboard")) {