[parisc-linux] STI without PCI

Matthew Wilcox willy@debian.org
Fri, 15 Mar 2002 13:58:01 +0000


Right now, it's not possible to compile STI in without PCI.  This patch
should fix that.  Feedback appreciated.

Index: drivers/video/sti/sticore.c
===================================================================
RCS file: /var/cvs/linux/drivers/video/sti/sticore.c,v
retrieving revision 1.37
diff -u -p -r1.37 sticore.c
--- drivers/video/sti/sticore.c	2002/03/03 23:05:06	1.37
+++ drivers/video/sti/sticore.c	2002/03/15 13:56:24
@@ -918,10 +918,10 @@ static int __init sticore_pa_init(struct
 	return 0;
 }
 
-
 static int __devinit sticore_pci_init(struct pci_dev *pd,
 		const struct pci_device_id *ent)
 {
+#ifdef CONFIG_PCI
 	unsigned long fb_base, rom_base;
 	unsigned int fb_len, rom_len;
 	struct sti_struct *sti;
@@ -962,10 +962,9 @@ static int __devinit sticore_pci_init(st
 			pd->name);
 		return -ENODEV;
 	}
-
+#endif /* CONFIG_PCI */
 	return 0;
 }
-
 
 static void __devexit sticore_pci_remove(struct pci_dev *pd)
 {

-- 
Revolutions do not require corporate support.