summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@fairlite.demon.co.uk>2001-08-24 11:04:44 +0000
committerAlan Hourihane <alanh@fairlite.demon.co.uk>2001-08-24 11:04:44 +0000
commit4b4e2929587fbd7339ccfb868159002b33c26d69 (patch)
tree8ad1b5d071ec14adfeb0a73d3efc0610aa17ec93
parente8fd19a35a80f222cc6521b3c61fe04f3db50b69 (diff)
final lot
-rw-r--r--linux/mga_dma.c6
-rw-r--r--linux/r128_state.c2
-rw-r--r--linux/radeon_drv.h4
3 files changed, 6 insertions, 6 deletions
diff --git a/linux/mga_dma.c b/linux/mga_dma.c
index 81932029..022575db 100644
--- a/linux/mga_dma.c
+++ b/linux/mga_dma.c
@@ -41,7 +41,7 @@
#ifdef __linux__
#include <linux/interrupt.h> /* For task queue support */
#include <linux/delay.h>
-#endif
+#endif /* __linux__ */
#define MGA_DEFAULT_USEC_TIMEOUT 10000
#define MGA_FREELIST_DEBUG 0
@@ -640,7 +640,7 @@ static int mga_do_init_dma( drm_device_t *dev, drm_mga_init_t *init )
#ifdef __linux__
spin_lock_init( &dev_priv->prim.list_lock );
-#endif
+#endif /* __linux__ */
dev_priv->prim.status[0] = dev_priv->primary->offset;
dev_priv->prim.status[1] = 0;
@@ -732,7 +732,7 @@ int mga_dma_flush( DRM_OS_IOCTL )
if ( lock.flags & _DRM_LOCK_QUIESCENT ) {
#if MGA_DMA_DEBUG
int ret = mga_do_wait_for_idle( dev_priv );
-#ifdef __linux
+#ifdef __linux__
if ( ret < 0 )
#endif /* __linux__ */
#ifdef __FreeBSD__
diff --git a/linux/r128_state.c b/linux/r128_state.c
index 7c276482..2b6c3d88 100644
--- a/linux/r128_state.c
+++ b/linux/r128_state.c
@@ -30,7 +30,7 @@
#ifdef __linux__
#define __NO_VERSION__
#include <linux/delay.h>
-#endif
+#endif /* __linux__ */
#include "r128.h"
#include "drmP.h"
diff --git a/linux/radeon_drv.h b/linux/radeon_drv.h
index 482c2561..402a6441 100644
--- a/linux/radeon_drv.h
+++ b/linux/radeon_drv.h
@@ -660,7 +660,7 @@ do { \
radeon_freelist_reset( dev ); \
} \
} while (0)
-#endif
+#endif /* __linux__ */
#ifdef __FreeBSD__
#define VB_AGE_TEST_WITH_RETURN( dev_priv ) \
do { \
@@ -672,7 +672,7 @@ do { \
radeon_freelist_reset( dev ); \
} \
} while (0)
-#endif
+#endif /* __FreeBSD__ */
#define RADEON_DISPATCH_AGE( age ) do { \
OUT_RING( CP_PACKET0( RADEON_LAST_DISPATCH_REG, 0 ) ); \