Remove declaration check and AM conditional HAVE_ISA along with the code conditionnaly included.
Signed-off-by: Gaetan Nadon <[email protected]> --- configure.ac | 8 -------- src/fbdev.c | 14 -------------- 2 files changed, 0 insertions(+), 22 deletions(-) diff --git a/configure.ac b/configure.ac index e1b9c68..12cc5ed 100644 --- a/configure.ac +++ b/configure.ac @@ -64,14 +64,6 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto) # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES]) -save_CFLAGS="$CFLAGS" -CFLAGS="$XORG_CFLAGS" -AC_CHECK_DECL(xf86ConfigIsaEntity, - [AC_DEFINE(HAVE_ISA, 1, [Have ISA support])], - [], - [#include "xf86.h"]) -CFLAGS="$save_CFLAGS" - AM_CONDITIONAL(PCIACCESS, [test "x$PCIACCESS" = xyes]) if test "x$PCIACCESS" = xyes; then AC_DEFINE(PCIACCESS, 1, [Use libpciaccess]) diff --git a/src/fbdev.c b/src/fbdev.c index c97ce1c..286fa39 100644 --- a/src/fbdev.c +++ b/src/fbdev.c @@ -314,11 +314,6 @@ FBDevProbe(DriverPtr drv, int flags) isPci = TRUE; } else #endif -#ifdef HAVE_ISA - if (xf86ParseIsaBusString(devSections[i]->busID)) - isIsa = TRUE; - else -#endif 0; } @@ -343,15 +338,6 @@ FBDevProbe(DriverPtr drv, int flags) #endif } else if (isIsa) { -#ifdef HAVE_ISA - int entity; - - entity = xf86ClaimIsaSlot(drv, 0, - devSections[i], TRUE); - pScrn = xf86ConfigIsaEntity(pScrn,0,entity, - NULL,RES_SHARED_VGA, - NULL,NULL,NULL,NULL); -#endif } else { int entity; -- 1.6.0.4 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
