diff options
| author | Keith Packard <keithp@keithp.com> | 2010-11-10 16:11:29 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-11-10 16:11:29 -0800 |
| commit | c9c0f93f8ed42413a05193ee71c69fa6b41f6a03 (patch) | |
| tree | 89fe2ca8c90c47cde62d5a74c6763921f08f8758 | |
| parent | 73f6de1ad8b5e1641102b54ff48a36ebb99ccacb (diff) | |
| parent | 4132b1c591bd01c29df91b88afbd144647da9ed8 (diff) | |
Merge remote branch 'whot/for-keith'
| -rw-r--r-- | hw/xfree86/common/Makefile.am | 2 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86Config.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am index 821a2b500..989208f4e 100644 --- a/hw/xfree86/common/Makefile.am +++ b/hw/xfree86/common/Makefile.am @@ -17,8 +17,6 @@ if DGA DGASOURCES = xf86DGA.c endif -XISOURCES = xf86Xinput.c xisb.c -XISDKINCS = xf86Xinput.h xisb.h RANDRSOURCES = xf86RandR.c BUSSOURCES = xf86pciBus.c xf86fbBus.c xf86noBus.c $(SBUS_SOURCES) diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index 92fb74da8..e3b2831c2 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -504,7 +504,6 @@ fixup_video_driver_list(char **drivers) static const char *fallback[4] = { "vesa", "fbdev", "wsfb", NULL }; char **end, **drv; char *x; - char **ati, **atimisc; int i; /* walk to the end of the list */ @@ -2211,7 +2210,6 @@ configDevice(GDevPtr devicep, XF86ConfDevicePtr conf_device, Bool active) static void configDRI(XF86ConfDRIPtr drip) { - int i; struct group *grp; xf86ConfigDRI.group = -1; |