small fixups (now compiles again on Linux)

6 files changed, 12 insertions, 22 deletions

diff --git a/linux-core/drm_bufs.c b/linux-core/drm_bufs.c
index 83be94e5..55234a01 100644
--- a/linux-core/drm_bufs.c
+++ b/linux-core/drm_bufs.c
@@ -787,8 +787,6 @@ int DRM(addbufs_pci)( DRM_OS_IOCTL )
 int DRM(addbufs_sg)( DRM_OS_IOCTL )
 {
 	DRM_OS_DEVICE;
-	drm_file_t *priv = filp->private_data;
-	drm_device_t *dev = priv->dev;
 	drm_device_dma_t *dma = dev->dma;
 	drm_buf_desc_t request;
 	drm_buf_entry_t *entry;
diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c
index 349efcd3..dadad858 100644
--- a/linux-core/drm_drv.c
+++ b/linux-core/drm_drv.c
@@ -148,6 +148,7 @@ static struct file_operations	DRM(fops) = {	\
 #include <machine/../linux/linux.h>
 #include <machine/../linux/linux_proto.h>
 #include "drm_linux.h"
+#endif
 #endif /* __FreeBSD__ */
 #endif
 
@@ -158,11 +159,6 @@ static struct file_operations	DRM(fops) = {	\
 #define DRIVER_NUM_CARDS 1
 #endif
 
-#ifdef __linux__
-static drm_device_t	DRM(device);
-static int              DRM(minor);
-#endif
-
 #ifdef __FreeBSD__
 static int DRM(init)(device_t nbdev);
 static void DRM(cleanup)(device_t nbdev);
@@ -177,7 +173,7 @@ MODULE_DEPEND(DRIVER_NAME, agp, 1, 1, 1);
 #if DRM_LINUX
 MODULE_DEPEND(DRIVER_NAME, linux, 1, 1, 1);
 #endif
-#endif /* __FreeBSD__
+#endif /* __FreeBSD__ */
 
 static drm_device_t	*DRM(device);
 static int		*DRM(minor);
@@ -265,6 +261,7 @@ static char *drm_opts = NULL;
 MODULE_AUTHOR( DRIVER_AUTHOR );
 MODULE_DESCRIPTION( DRIVER_DESC );
 MODULE_PARM( drm_opts, "s" );
+#endif
 
 #ifdef __FreeBSD__
 static int DRM(probe)(device_t dev)
@@ -716,13 +713,12 @@ static int drm_count_cards(void)
  */
 #ifdef __linux__
 static int __init drm_init( void )
-{
 #endif
 #ifdef __FreeBSD__
 static int DRM(init)( device_t nbdev )
-{
 #endif
-
+{
+	drm_device_t *dev;
 	int i;
 #if __HAVE_CTX_BITMAP
 	int retcode;
diff --git a/linux/drm_bufs.h b/linux/drm_bufs.h
index 83be94e5..55234a01 100644
--- a/linux/drm_bufs.h
+++ b/linux/drm_bufs.h
@@ -787,8 +787,6 @@ int DRM(addbufs_pci)( DRM_OS_IOCTL )
 int DRM(addbufs_sg)( DRM_OS_IOCTL )
 {
 	DRM_OS_DEVICE;
-	drm_file_t *priv = filp->private_data;
-	drm_device_t *dev = priv->dev;
 	drm_device_dma_t *dma = dev->dma;
 	drm_buf_desc_t request;
 	drm_buf_entry_t *entry;
diff --git a/linux/drm_drv.h b/linux/drm_drv.h
index 349efcd3..dadad858 100644
--- a/linux/drm_drv.h
+++ b/linux/drm_drv.h
@@ -148,6 +148,7 @@ static struct file_operations	DRM(fops) = {	\
 #include <machine/../linux/linux.h>
 #include <machine/../linux/linux_proto.h>
 #include "drm_linux.h"
+#endif
 #endif /* __FreeBSD__ */
 #endif
 
@@ -158,11 +159,6 @@ static struct file_operations	DRM(fops) = {	\
 #define DRIVER_NUM_CARDS 1
 #endif
 
-#ifdef __linux__
-static drm_device_t	DRM(device);
-static int              DRM(minor);
-#endif
-
 #ifdef __FreeBSD__
 static int DRM(init)(device_t nbdev);
 static void DRM(cleanup)(device_t nbdev);
@@ -177,7 +173,7 @@ MODULE_DEPEND(DRIVER_NAME, agp, 1, 1, 1);
 #if DRM_LINUX
 MODULE_DEPEND(DRIVER_NAME, linux, 1, 1, 1);
 #endif
-#endif /* __FreeBSD__
+#endif /* __FreeBSD__ */
 
 static drm_device_t	*DRM(device);
 static int		*DRM(minor);
@@ -265,6 +261,7 @@ static char *drm_opts = NULL;
 MODULE_AUTHOR( DRIVER_AUTHOR );
 MODULE_DESCRIPTION( DRIVER_DESC );
 MODULE_PARM( drm_opts, "s" );
+#endif
 
 #ifdef __FreeBSD__
 static int DRM(probe)(device_t dev)
@@ -716,13 +713,12 @@ static int drm_count_cards(void)
  */
 #ifdef __linux__
 static int __init drm_init( void )
-{
 #endif
 #ifdef __FreeBSD__
 static int DRM(init)( device_t nbdev )
-{
 #endif
-
+{
+	drm_device_t *dev;
 	int i;
 #if __HAVE_CTX_BITMAP
 	int retcode;
diff --git a/linux/r128_cce.c b/linux/r128_cce.c
index 169a7081..f17e58d1 100644
--- a/linux/r128_cce.c
+++ b/linux/r128_cce.c
@@ -369,6 +369,7 @@ static void r128_cce_init_ring_buffer( drm_device_t *dev,
 		DRM_DEBUG( "ring rptr: offset=0x%08lx handle=0x%08lx\n",
 			   virt_to_bus(entry->pagelist[page_ofs]->virtual),
 			   entry->handle + tmp_ofs );
+#endif
 	}
 #endif
 
diff --git a/linux/radeon_cp.c b/linux/radeon_cp.c
index 71f2fc64..88269b6b 100644
--- a/linux/radeon_cp.c
+++ b/linux/radeon_cp.c
@@ -643,6 +643,7 @@ static void radeon_cp_init_ring_buffer( drm_device_t *dev,
 		DRM_DEBUG( "ring rptr: offset=0x%08lx handle=0x%08lx\n",
 			   virt_to_bus(entry->pagelist[page_ofs]->virtual),
 			   entry->handle + tmp_ofs );
+#endif
 	}
 #endif