dirty hack to make mach64 work, (don't worry I'll get around to fixing it
authorDave Airlie <airlied@linux.ie>
Sat, 12 Jun 2004 02:30:52 +0000 (02:30 +0000)
committerDave Airlie <airlied@linux.ie>
Sat, 12 Jun 2004 02:30:52 +0000 (02:30 +0000)
    asap..)

linux-core/drm_drv.c
linux/drm_drv.h

index d527409..00aa187 100644 (file)
@@ -708,14 +708,18 @@ static int __init drm_init( void )
                pdev = pci_get_subsys(DRM(pciidlist[i]).vendor, DRM(pciidlist[i]).device, DRM(pciidlist[i]).subvendor, DRM(pciidlist[i]).subdevice, NULL);
                if (pdev)
                {
+#ifndef __MACH64_H__
                        pdriver = pci_dev_driver(pdev);
                        if (pdriver)
                        {
+#endif
                                DRM(fb_loaded)=1;
                                drm_probe(pdev, &DRM(pciidlist[i]));
+#ifndef __MACH64_H__
                        }
                        else
                                pci_dev_put(pdev);
+#endif
                }
        }
        
index d527409..00aa187 100644 (file)
@@ -708,14 +708,18 @@ static int __init drm_init( void )
                pdev = pci_get_subsys(DRM(pciidlist[i]).vendor, DRM(pciidlist[i]).device, DRM(pciidlist[i]).subvendor, DRM(pciidlist[i]).subdevice, NULL);
                if (pdev)
                {
+#ifndef __MACH64_H__
                        pdriver = pci_dev_driver(pdev);
                        if (pdriver)
                        {
+#endif
                                DRM(fb_loaded)=1;
                                drm_probe(pdev, &DRM(pciidlist[i]));
+#ifndef __MACH64_H__
                        }
                        else
                                pci_dev_put(pdev);
+#endif
                }
        }