configure.ac | 10 +++++++++-
src/neo_driver.c | 12 +++++++-----
2 files changed, 16 insertions(+), 6 deletions(-)
New commits:
commit 9bfdc7232a77472c4a1c13c869f6bc52916ce664
Author: Dave Airlie <airl...@redhat.com>
Date: Mon Dec 22 14:37:21 2008 +1000
neomagic 1.2.2
diff --git a/configure.ac b/configure.ac
index 5a3c074..2f7843a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-neomagic],
- 1.2.1,
+ 1.2.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-neomagic)
commit 4eb1e9385e00e8c2a876b3ef4ef8fdc08f78fcca
Author: Adam Jackson <a...@redhat.com>
Date: Sun Nov 23 17:40:37 2008 -0500
Make ISA optional
diff --git a/configure.ac b/configure.ac
index 97fd8f2..5a3c074 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,6 +59,14 @@ XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto
$REQUIRED_MODULES])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+save_CFLAGS="$CFLAGS"
+CFLAGS="$XORG_CFLAGS"
+AC_CHECK_DECL(xf86ConfigIsaEntity,
+ [AC_DEFINE(HAVE_ISA, 1, [Have ISA support])],
+ [],
+ [#include "xf86.h"])
+CFLAGS="$save_CFLAGS"
+
# Checks for libraries.
SAVE_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
diff --git a/src/neo_driver.c b/src/neo_driver.c
index 4ceb558..f472601 100644
--- a/src/neo_driver.c
+++ b/src/neo_driver.c
@@ -322,6 +322,7 @@ static PciChipsets NEOPCIchipsets[] = {
{ -1, -1, RES_UNDEFINED}
};
+#ifdef HAVE_ISA
static IsaChipsets NEOISAchipsets[] = {
{ NM2070, RES_EXCLUSIVE_VGA },
{ NM2090, RES_EXCLUSIVE_VGA },
@@ -331,6 +332,7 @@ static IsaChipsets NEOISAchipsets[] = {
{ NM2200, RES_EXCLUSIVE_VGA },
{ -1, RES_UNDEFINED }
};
+#endif
/* The options supported by the Neomagic Driver */
typedef enum {
@@ -643,7 +645,8 @@ NEOProbe(DriverPtr drv, int flags)
xfree(usedChips);
}
}
-
+
+#ifdef HAVE_ISA
/* Isa Bus */
numUsed = xf86MatchIsaInstances(NEO_NAME,NEOChipsets,NEOISAchipsets,
@@ -674,11 +677,13 @@ NEOProbe(DriverPtr drv, int flags)
}
xfree(usedChips);
}
+#endif
xfree(devSections);
return foundScreen;
}
+#ifdef HAVE_ISA
static int
neoFindIsaDevice(GDevPtr dev)
{
@@ -705,7 +710,7 @@ neoFindIsaDevice(GDevPtr dev)
return -1;
}
}
-
+#endif
/* Mandatory */
Bool
commit 92f61f85794607ff7d909c5502594a16294ca22e
Author: Adam Jackson <a...@redhat.com>
Date: Fri Aug 15 14:06:19 2008 -0400
Uninclude xf86Version.h
diff --git a/src/neo_driver.c b/src/neo_driver.c
index 31e47f0..4ceb558 100644
--- a/src/neo_driver.c
+++ b/src/neo_driver.c
@@ -62,9 +62,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
/* Drivers that need to access the PCI config space directly need this */
#include "xf86Pci.h"
-/* This is used for module versioning */
-#include "xf86Version.h"
-
/* All drivers using the vgahw module need this */
#include "vgaHW.h"
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
