r300: Corrected another error; regexp replaced something it shouldn't have.

diff --git a/src/mesa/drivers/dri/r300/radeon_lock.h b/src/mesa/drivers/dri/r300/radeon_lock.h
index 3c1c8c2a0de68333c27e83ade56fc42aa13f7614..c47adc9575b88835cd5327d403809f6cfc542709 100644 (file)
--- a/src/mesa/drivers/dri/r300/radeon_lock.h
+++ b/src/mesa/drivers/dri/r300/radeon_lock.h
@@ -107,27 +107,12 @@ extern int prevLockLine;
                DEBUG_LOCK();                                           \
        } while (0)
 
-#if R200_MERGED
 #define UNLOCK_HARDWARE( rmesa )                                       \
        do {                                                            \
                DRM_UNLOCK((rmesa)->dri.fd,                             \
                        (rmesa)->dri.hwLock,                            \
                        (rmesa)->dri.hwContext);                        \
                DEBUG_RESET();                                          \
-               if (IS_R200_CLASS((rmesa)->radeonScreen)) {             \
-                       r200ContextPtr __r200 = (r200ContextPtr)(rmesa); \
-                       if (__r200->save_on_next_unlock)                \
-                               r200SaveHwState(__r200);                \
-                       __r200->save_on_next_unlock = GL_FALSE;         \
-               }                                                       \
        } while (0)
-#else
-#define UNLOCK_HARDWARErmesa                                   \
-       do {                                                            \
-               DRM_UNLOCK((rmesa)->dri.fd,                             \
-                       (rmesa)->dri.hwLock,                            \
-                       (rmesa)->dri.hwContext);                        \
-               DEBUG_RESET();                                          \
-       } while (0)
-#endif
+
 #endif                         /* __RADEON_LOCK_H__ */