Merge remote branch 'whot/for-keith'
This commit is contained in:
commit
c9c0f93f8e
|
@ -17,8 +17,6 @@ if DGA
|
||||||
DGASOURCES = xf86DGA.c
|
DGASOURCES = xf86DGA.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
XISOURCES = xf86Xinput.c xisb.c
|
|
||||||
XISDKINCS = xf86Xinput.h xisb.h
|
|
||||||
RANDRSOURCES = xf86RandR.c
|
RANDRSOURCES = xf86RandR.c
|
||||||
|
|
||||||
BUSSOURCES = xf86pciBus.c xf86fbBus.c xf86noBus.c $(SBUS_SOURCES)
|
BUSSOURCES = xf86pciBus.c xf86fbBus.c xf86noBus.c $(SBUS_SOURCES)
|
||||||
|
|
|
@ -504,7 +504,6 @@ fixup_video_driver_list(char **drivers)
|
||||||
static const char *fallback[4] = { "vesa", "fbdev", "wsfb", NULL };
|
static const char *fallback[4] = { "vesa", "fbdev", "wsfb", NULL };
|
||||||
char **end, **drv;
|
char **end, **drv;
|
||||||
char *x;
|
char *x;
|
||||||
char **ati, **atimisc;
|
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
/* walk to the end of the list */
|
/* walk to the end of the list */
|
||||||
|
@ -2211,7 +2210,6 @@ configDevice(GDevPtr devicep, XF86ConfDevicePtr conf_device, Bool active)
|
||||||
static void
|
static void
|
||||||
configDRI(XF86ConfDRIPtr drip)
|
configDRI(XF86ConfDRIPtr drip)
|
||||||
{
|
{
|
||||||
int i;
|
|
||||||
struct group *grp;
|
struct group *grp;
|
||||||
|
|
||||||
xf86ConfigDRI.group = -1;
|
xf86ConfigDRI.group = -1;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user