From 1ee210e3b5b2d0b9101e371ec1401cdc34b2f25d Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Sat, 12 Jun 2004 02:30:52 +0000 Subject: [PATCH] dirty hack to make mach64 work, (don't worry I'll get around to fixing it asap..) --- linux-core/drm_drv.c | 4 ++++ linux/drm_drv.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c index d5274094..00aa1871 100644 --- a/linux-core/drm_drv.c +++ b/linux-core/drm_drv.c @@ -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 } } diff --git a/linux/drm_drv.h b/linux/drm_drv.h index d5274094..00aa1871 100644 --- a/linux/drm_drv.h +++ b/linux/drm_drv.h @@ -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 } }