Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

* 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (22 commits)
  drm: add initial r500 drm support
  radeon: setup the ring buffer fetcher to be less agressive.
  drm: fixup some of the ioctl function exit paths
  drm: the drm really should call pci_set_master..
  i915: Add chipset id for Intel Integrated Graphics Device
  drm: cleanup DRM_DEBUG() parameters
  drm/i915: add support for E7221 chipset
  drm: don't cast a pointer to pointer of list_head
  mga_dma: return 'err' not just zero from mga_do_cleanup_dma()
  drm: add _DRM_DRIVER flag, and re-order unload.
  drm: enable udev node creation
  drm: Make DRM_IOCTL_GET_CLIENT return EINVAL when it can't find client #idx.
  drm: move drm_mem_init to proper place in startup sequence
  drm: call driver load function after initialising AGP
  drm: Fix ioc32 compat layer
  drm: fd.o bug #11895: Only add the AGP base to map offset if the caller didn't.
  i915: add suspend/resume support
  drm: update DRM sysfs support
  drm: Initialize the AGP structure's base address at init rather than enable.
  drm: move two function extern into the correct block
  ...

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/char/drm/savage_state.c b/drivers/char/drm/savage_state.c
index bf8e0e10fe21..5f6238fdf1fa 100644
--- a/drivers/char/drm/savage_state.c
+++ b/drivers/char/drm/savage_state.c
@@ -512,7 +512,7 @@ static int savage_dispatch_vb_prim(drm_savage_private_t * dev_priv,
                         DMA_DRAW_PRIMITIVE(count, prim, skip);
 
                         if (vb_stride == vtx_size) {
-                                DMA_COPY(&vtxbuf[vb_stride * start], 
+                                DMA_COPY(&vtxbuf[vb_stride * start],
                                          vtx_size * count);
                         } else {
                                 for (i = start; i < start + count; ++i) {
@@ -742,7 +742,7 @@ static int savage_dispatch_vb_idx(drm_savage_private_t * dev_priv,
         while (n != 0) {
                 /* Can emit up to 255 vertices (85 triangles) at once. */
                 unsigned int count = n > 255 ? 255 : n;
-                
+
                 /* Check indices */
                 for (i = 0; i < count; ++i) {
                         if (idx[i] > vb_size / (vb_stride * 4)) {
@@ -933,7 +933,7 @@ static int savage_dispatch_draw(drm_savage_private_t * dev_priv,
                                 /* j was check in savage_bci_cmdbuf */
                                 ret = savage_dispatch_vb_idx(dev_priv,
                                         &cmd_header, (const uint16_t *)cmdbuf,
-                                        (const uint32_t *)vtxbuf, vb_size, 
+                                        (const uint32_t *)vtxbuf, vb_size,
                                         vb_stride);
                                 cmdbuf += j;
                                 break;