From ca820fca877faf4776be142417795a5945c606e6 Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Tue, 25 Sep 2001 09:32:16 +0000
Subject: merge with 2.4.10 kernel

---
 linux-core/drm_ioctl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'linux-core/drm_ioctl.c')

diff --git a/linux-core/drm_ioctl.c b/linux-core/drm_ioctl.c
index adcb22c8..0d8a1259 100644
--- a/linux-core/drm_ioctl.c
+++ b/linux-core/drm_ioctl.c
@@ -98,7 +98,6 @@ int DRM(setunique)(struct inode *inode, struct file *filp,
 	}
 	sprintf(dev->devname, "%s@%s", dev->name, dev->unique);
 
-#ifdef __alpha__
 	do {
 		struct pci_dev *pci_dev;
                 int b, d, f;
@@ -116,10 +115,11 @@ int DRM(setunique)(struct inode *inode, struct file *filp,
                 pci_dev = pci_find_slot(b, PCI_DEVFN(d,f));
                 if (pci_dev) {
 			dev->pdev = pci_dev;
+#ifdef __alpha__
 			dev->hose = pci_dev->sysdata;
+#endif
 		}
         } while(0);
-#endif
 
 	return 0;
 }
-- 
cgit v1.2.3