configure: Drop PanelID test

vbe grew PanelID support in xserver 1.4; since we now require 1.6 we can
remove the test.  Which is good, because it appears to have been broken
by the scrnIndex->pScrn conversion, as vbe.h doesn't include xf86str.h
so ScrnInfoPtr was never defined and the test failed.

Signed-off-by: Adam Jackson <ajax@redhat.com>

2 files changed, 0 insertions, 10 deletions

diff --git a/configure.ac b/configure.ac
index 79532ab..0b22eff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,14 +75,6 @@ CFLAGS="$save_CFLAGS"
 
 save_CFLAGS="$CFLAGS"
 CFLAGS="$XORG_CFLAGS"
-AC_CHECK_DECL(VBEReadPanelID,
-	      [AC_DEFINE(HAVE_PANELID, 1, [Have VBE PanelID call])],
-	      [],
-	      [#include "vbe.h"])
-CFLAGS="$save_CFLAGS"
-
-save_CFLAGS="$CFLAGS"
-CFLAGS="$XORG_CFLAGS"
 AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
               [XSERVER_LIBPCIACCESS=yes], [XSERVER_LIBPCIACCESS=no],
               [#include "xorg-server.h"])
diff --git a/src/vesa.c b/src/vesa.c
index 9e3a112..564bb06 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -733,13 +733,11 @@ VESAPreInit(ScrnInfoPtr pScrn, int flags)
 
     if ((pScrn->monitor->DDC = pVesa->monitor) != NULL)
 	xf86SetDDCproperties(pScrn, pVesa->monitor);
-#ifdef HAVE_PANELID
     else {
 	void *panelid = VBEReadPanelID(pVesa->pVbe);
 	VBEInterpretPanelID(SCRN_OR_INDEX_ARG(pScrn), panelid);
 	free(panelid);
     }
-#endif
 
     xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, DEBUG_VERB,
 			"Searching for matching VESA mode(s):\n");