Merge master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6

Manual fixups for some clashes due to re-indenting.

1 files changed, 31 insertions, 32 deletions

diff --git a/drivers/char/drm/r128_drv.c b/drivers/char/drm/r128_drv.c
index bc446da1b210..1661e7351402 100644
--- a/drivers/char/drm/r128_drv.c
+++ b/drivers/char/drm/r128_drv.c
@@ -37,30 +37,28 @@
 
 #include "drm_pciids.h"
 
-static int postinit( struct drm_device *dev, unsigned long flags )
+static int postinit(struct drm_device *dev, unsigned long flags)
 {
-        DRM_INFO( "Initialized %s %d.%d.%d %s on minor %d: %s\n",
-                DRIVER_NAME,
-                DRIVER_MAJOR,
-                DRIVER_MINOR,
-                DRIVER_PATCHLEVEL,
-                DRIVER_DATE,
-                dev->primary.minor,
-                pci_pretty_name(dev->pdev)
-                );
+        DRM_INFO("Initialized %s %d.%d.%d %s on minor %d: %s\n",
+                 DRIVER_NAME,
+                 DRIVER_MAJOR,
+                 DRIVER_MINOR,
+                 DRIVER_PATCHLEVEL,
+                 DRIVER_DATE, dev->primary.minor, pci_pretty_name(dev->pdev)
+            );
         return 0;
 }
 
-static int version( drm_version_t *version )
+static int version(drm_version_t * version)
 {
         int len;
 
         version->version_major = DRIVER_MAJOR;
         version->version_minor = DRIVER_MINOR;
         version->version_patchlevel = DRIVER_PATCHLEVEL;
-        DRM_COPY( version->name, DRIVER_NAME );
-        DRM_COPY( version->date, DRIVER_DATE );
-        DRM_COPY( version->desc, DRIVER_DESC );
+        DRM_COPY(version->name, DRIVER_NAME);
+        DRM_COPY(version->date, DRIVER_DATE);
+        DRM_COPY(version->desc, DRIVER_DESC);
         return 0;
 }
 
@@ -68,11 +66,11 @@ static struct pci_device_id pciidlist[] = {
         r128_PCI_IDS
 };
 
-extern drm_ioctl_desc_t r128_ioctls[];
-extern int r128_max_ioctl;
-
 static struct drm_driver driver = {
-        .driver_features = DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA | DRIVER_SG | DRIVER_HAVE_DMA | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_IRQ_VBL,
+        .driver_features =
+            DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA | DRIVER_SG |
+            DRIVER_HAVE_DMA | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED |
+            DRIVER_IRQ_VBL,
         .dev_priv_size = sizeof(drm_r128_buf_priv_t),
         .prerelease = r128_driver_prerelease,
         .pretakedown = r128_driver_pretakedown,
@@ -89,21 +87,22 @@ static struct drm_driver driver = {
         .ioctls = r128_ioctls,
         .dma_ioctl = r128_cce_buffers,
         .fops = {
-                .owner = THIS_MODULE,
-                .open = drm_open,
-                .release = drm_release,
-                .ioctl = drm_ioctl,
-                .mmap = drm_mmap,
-                .poll = drm_poll,
-                .fasync = drm_fasync,
+                 .owner = THIS_MODULE,
+                 .open = drm_open,
+                 .release = drm_release,
+                 .ioctl = drm_ioctl,
+                 .mmap = drm_mmap,
+                 .poll = drm_poll,
+                 .fasync = drm_fasync,
 #ifdef CONFIG_COMPAT
-                .compat_ioctl = r128_compat_ioctl,
+                 .compat_ioctl = r128_compat_ioctl,
 #endif
-        },
+                 }
+        ,
         .pci_driver = {
-                .name          = DRIVER_NAME,
-                .id_table      = pciidlist,
-        }
+                       .name = DRIVER_NAME,
+                       .id_table = pciidlist,
+                       }
 };
 
 static int __init r128_init(void)
@@ -120,6 +119,6 @@ static void __exit r128_exit(void)
 module_init(r128_init);
 module_exit(r128_exit);
 
-MODULE_AUTHOR( DRIVER_AUTHOR );
-MODULE_DESCRIPTION( DRIVER_DESC );
+MODULE_AUTHOR(DRIVER_AUTHOR);
+MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE("GPL and additional rights");