On Tuesday 28 of July 2009, Dave Airlie wrote: > src/i810_driver.c | 13 ------------- > src/i830_driver.c | 17 ----------------- > 2 files changed, 30 deletions(-) > > New commits: > commit 9bc0096f9de4b85ca6d6a5db109e49c4364bcee7 > Author: Dave Airlie <[email protected]> > Date: Tue Jul 28 13:55:39 2009 +1000 > > intel: since driver depends on newer server don't need to wrap this > > drop resource/RAC interactions > > diff --git a/src/i810_driver.c b/src/i810_driver.c > index 822236a..f158f5d 100644 > --- a/src/i810_driver.c > +++ b/src/i810_driver.c > @@ -55,10 +55,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. > */ > #include "xf86.h" > #include "xf86_OSproc.h" > -#ifndef XSERVER_LIBPCIACCESS > -#include "xf86Resources.h" > -#include "xf86RAC.h" > -#endif > #include "xf86cmap.h" > #include "compiler.h" > #include "mibstore.h" > diff --git a/src/i830_driver.c b/src/i830_driver.c > index f95160b..f701231 100644 > --- a/src/i830_driver.c > +++ b/src/i830_driver.c > @@ -51,10 +51,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. > > #include "xf86.h" > #include "xf86_OSproc.h" > -#ifndef XSERVER_LIBPCIACCESS > -#include "xf86Resources.h" > -#include "xf86RAC.h" > -#endif > #include "xf86Priv.h" > #include "xf86cmap.h" > #include "compiler.h"
These changes break build of intel master with current stable xserver: Making all in render_program CC i830_driver.o i830_driver.c:126: error: ‘RES_SHARED_VGA’ undeclared here (not in a function) i830_driver.c:154: error: ‘RES_UNDEFINED’ undeclared here (not in a function) make[3]: *** [i830_driver.lo] Błąd 1 etc This fixes that: diff --git a/src/i810_driver.c b/src/i810_driver.c index f158f5d..99e31c8 100644 --- a/src/i810_driver.c +++ b/src/i810_driver.c @@ -55,6 +55,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "xf86.h" #include "xf86_OSproc.h" +#include "xf86Resources.h" #include "xf86cmap.h" #include "compiler.h" #include "mibstore.h" diff --git a/src/i830_driver.c b/src/i830_driver.c index f701231..913b26f 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -51,6 +51,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include "xf86.h" #include "xf86_OSproc.h" +#include "xf86Resources.h" #include "xf86Priv.h" #include "xf86cmap.h" #include "compiler.h" -- Arkadiusz Miśkiewicz PLD/Linux Team arekm / maven.pl http://ftp.pld-linux.org/ _______________________________________________ xorg mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/xorg
