Merge branch 'master' of ../linux-2.6/

[linux-2.6] / drivers / char / drm / i830_dma.c

diff --git a/drivers/char/drm/i830_dma.c b/drivers/char/drm/i830_dma.c
index 43a1f78712d6cc784f24048d10b9ca71cbc060a9..9df08105f4f3676b86595753badca719ad433e50 100644 (file)
--- a/drivers/char/drm/i830_dma.c
+++ b/drivers/char/drm/i830_dma.c
@@ -36,13 +36,13 @@
 #include "i830_drm.h"
 #include "i830_drv.h"
 #include <linux/interrupt.h>   /* For task queue support */
-#include <linux/pagemap.h>     /* For FASTCALL on unlock_page() */
+#include <linux/pagemap.h>
 #include <linux/delay.h>
 #include <asm/uaccess.h>
 
 #define I830_BUF_FREE          2
 #define I830_BUF_CLIENT                1
-#define I830_BUF_HARDWARE              0
+#define I830_BUF_HARDWARE      0
 
 #define I830_BUF_UNMAPPED 0
 #define I830_BUF_MAPPED   1
@@ -1409,7 +1409,7 @@ static int i830_getbuf(struct drm_device *dev, void *data,
        retcode = i830_dma_get_buffer(dev, d, file_priv);
 
        DRM_DEBUG("i830_dma: %d returning %d, granted = %d\n",
-                 current->pid, retcode, d->granted);
+                 task_pid_nr(current), retcode, d->granted);
 
        sarea_priv->last_dispatch = (int)hw_status[5];