From 806d4343b3e84a407074f267258eb56b83fe9ca4 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@nuts.ninka.net>
Date: Mon, 24 Mar 2003 07:29:20 -0800
Subject: [PATCH] [DRM]: Fix warnings and build errors introduced by previous
 changes to drm_drv.h

---
 drivers/char/drm/drm_drv.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/char/drm/drm_drv.h b/drivers/char/drm/drm_drv.h
index 9a23166e6780b..1f53a305d8ff5 100644
--- a/drivers/char/drm/drm_drv.h
+++ b/drivers/char/drm/drm_drv.h
@@ -545,9 +545,7 @@ static int __init drm_init( void )
 
 	drm_device_t *dev;
 	int i;
-#if __HAVE_CTX_BITMAP
 	int retcode;
-#endif
 	DRM_DEBUG( "\n" );
 
 #ifdef MODULE
@@ -626,9 +624,11 @@ static int __init drm_init( void )
 
 	return 0;
 
+#if (__REALLY_HAVE_AGP && __MUST_HAVE_AGP) || __HAVE_CTX_BITMAP
 fail:
 	DRM(stub_unregister)(DRM(minor)[i]);
 	DRM(takedown)( dev );
+#endif
 
 fail_reg:
 	kfree (DRM(device));
-- 
2.53.0