Module Name: xsrc Committed By: mrg Date: Wed Jun 5 02:11:44 UTC 2013
Modified Files: xsrc/external/mit/xf86-video-wsfb/dist/src: wsfb_driver.c Log Message: fix a merge botch. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 \ xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c diff -u xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.18 xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.19 --- xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.18 Wed Jun 5 01:45:34 2013 +++ xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c Wed Jun 5 02:11:44 2013 @@ -219,7 +219,6 @@ static const char *ramdacSymbols[] = { }; #endif -#ifdef XFree86LOADER static XF86ModuleVersionInfo WsfbVersRec = { "wsfb", MODULEVENDORSTRING,