Update to xf86-video-neomagic 1.2.8.

7 files changed, 14 insertions, 10 deletions

diff --git a/driver/xf86-video-neomagic/src/Makefile.in b/driver/xf86-video-neomagic/src/Makefile.in
index c4509718b..0b0c5134f 100644
--- a/driver/xf86-video-neomagic/src/Makefile.in
+++ b/driver/xf86-video-neomagic/src/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.2 from Makefile.am.
+# Makefile.in generated by automake 1.12.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -245,6 +245,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
 PCIACCESS_LIBS = @PCIACCESS_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
diff --git a/driver/xf86-video-neomagic/src/neo.h b/driver/xf86-video-neomagic/src/neo.h
index 2fc80b093..7b386d4bb 100644
--- a/driver/xf86-video-neomagic/src/neo.h
+++ b/driver/xf86-video-neomagic/src/neo.h
@@ -321,3 +321,14 @@ typedef struct {
 #define PROBED_NM2097	0x83
 #define PROBED_NM2160	0x44
 #define PROBED_NM2200	0x45
+
+#define PCI_VENDOR_NEOMAGIC		0x10C8
+#define PCI_CHIP_NM2070			0x0001
+#define PCI_CHIP_NM2090			0x0002
+#define PCI_CHIP_NM2093			0x0003
+#define PCI_CHIP_NM2097			0x0083
+#define PCI_CHIP_NM2160			0x0004
+#define PCI_CHIP_NM2200			0x0005
+#define PCI_CHIP_NM2230			0x0025
+#define PCI_CHIP_NM2360			0x0006
+#define PCI_CHIP_NM2380			0x0016
diff --git a/driver/xf86-video-neomagic/src/neo_2090.c b/driver/xf86-video-neomagic/src/neo_2090.c
index 5049ab46f..2f1efc8a8 100644
--- a/driver/xf86-video-neomagic/src/neo_2090.c
+++ b/driver/xf86-video-neomagic/src/neo_2090.c
@@ -42,7 +42,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "compiler.h"
-#include "xf86PciInfo.h"
 
 /* Drivers that use XAA need this */
 #include "xf86fbman.h"
diff --git a/driver/xf86-video-neomagic/src/neo_dga.c b/driver/xf86-video-neomagic/src/neo_dga.c
index a51719410..1f251097a 100644
--- a/driver/xf86-video-neomagic/src/neo_dga.c
+++ b/driver/xf86-video-neomagic/src/neo_dga.c
@@ -29,7 +29,6 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Pci.h"
-#include "xf86PciInfo.h"
 #include "neo.h"
 #include "neo_reg.h"
 #include "dgaproc.h"
@@ -225,11 +224,9 @@ NEO_Sync(
    ScrnInfoPtr pScrn
 ){
     NEOPtr pNEO = NEOPTR(pScrn);
-#ifdef HAVE_XAA_H
     if(pNEO->AccelInfoRec) {
 	(*pNEO->AccelInfoRec->Sync)(pScrn);
     }
-#endif
 }
 
 static void 
diff --git a/driver/xf86-video-neomagic/src/neo_driver.c b/driver/xf86-video-neomagic/src/neo_driver.c
index b538dadbc..7e60f3eeb 100644
--- a/driver/xf86-video-neomagic/src/neo_driver.c
+++ b/driver/xf86-video-neomagic/src/neo_driver.c
@@ -60,9 +60,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "xf86RAC.h"
 #endif
 
-/* Drivers for PCI hardware need this */
-#include "xf86PciInfo.h"
-
 /* Drivers that need to access the PCI config space directly need this */
 #include "xf86Pci.h"
 
diff --git a/driver/xf86-video-neomagic/src/neo_i2c.c b/driver/xf86-video-neomagic/src/neo_i2c.c
index 82d1f2a46..5bbb3fb6f 100644
--- a/driver/xf86-video-neomagic/src/neo_i2c.c
+++ b/driver/xf86-video-neomagic/src/neo_i2c.c
@@ -44,7 +44,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "compiler.h"
 
 #include "xf86Pci.h"
-#include "xf86PciInfo.h"
 
 #include "vgaHW.h"
 
diff --git a/driver/xf86-video-neomagic/src/neo_shadow.c b/driver/xf86-video-neomagic/src/neo_shadow.c
index 2df765793..04efe4fa1 100644
--- a/driver/xf86-video-neomagic/src/neo_shadow.c
+++ b/driver/xf86-video-neomagic/src/neo_shadow.c
@@ -10,7 +10,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86PciInfo.h"
 #include "xf86Pci.h"
 #include "shadowfb.h"
 #include "servermd.h"