[parisc-linux-cvs] CONFIG_PCI=n changes

[Matthew Wilcox]

Index: include/asm-parisc/pci.h
===================================================================
RCS file: /var/cvs/linux/include/asm-parisc/pci.h,v
retrieving revision 1.34
diff -u -p -r1.34 pci.h
--- include/asm-parisc/pci.h    2001/11/04 05:18:43     1.34
+++ include/asm-parisc/pci.h    2001/11/08 21:01:53
@@ -208,9 +208,15 @@ extern int pci_post_reset_delay;   /* dela
 extern int pci_hba_count;
 extern struct pci_hba_data *parisc_pci_hba[];
 
+#ifdef CONFIG_PCI
 extern void pcibios_register_hba(struct pci_hba_data *);
 extern void pcibios_set_master(struct pci_dev *);
 extern void pcibios_assign_unassigned_resources(struct pci_bus *);
+#else
+extern inline void pcibios_register_hba(struct pci_hba_data *x)
+{
+}
+#endif
 
 /*
 ** used by drivers/pci/pci.c:pci_do_scan_bus()

Index: arch/parisc/config.in
===================================================================
RCS file: /var/cvs/linux/arch/parisc/config.in,v
retrieving revision 1.38
diff -u -p -r1.38 config.in
--- arch/parisc/config.in	2001/10/12 23:16:08	1.38
+++ arch/parisc/config.in	2001/11/08 21:13:10
@@ -45,34 +45,31 @@ mainmenu_option next_comment
 comment 'General options'
 
 bool 'Symmetric multi-processing support' CONFIG_SMP
+bool 'Chassis LCD and LED support' CONFIG_CHASSIS_LCD_LED
 
 bool 'Kernel Debugger support' CONFIG_KWDB
 # define_bool CONFIG_KWDB n
 
 bool 'U2/Uturn I/O MMU' CONFIG_IOMMU_CCIO
-bool 'GSC bus support' CONFIG_GSC
+bool 'VSC/GSC/HSC bus support' CONFIG_GSC
 dep_bool '  Lasi I/O support' CONFIG_GSC_LASI $CONFIG_GSC
 dep_bool '  Wax I/O support' CONFIG_GSC_WAX $CONFIG_GSC
 
-bool 'EISA support' CONFIG_EISA
+dep_bool 'EISA support' CONFIG_EISA $CONFIG_GSC
 define_bool CONFIG_ISA $CONFIG_EISA
 bool 'PCI support' CONFIG_PCI
 
 if [ "$CONFIG_PCI" = "y" ]; then
    dep_bool '  GSCtoPCI/Dino PCI support' CONFIG_GSC_DINO $CONFIG_GSC
    bool '  LBA/Elroy PCI support' CONFIG_PCI_LBA
+   define_bool CONFIG_IOSAPIC $CONFIG_PCI_LBA
+   define_bool CONFIG_IOMMU_SBA $CONFIG_PCI_LBA
+
 #   bool '  EPIC PCI support' CONFIG_PCI_EPIC n
    bool '  SuperIO support' CONFIG_SUPERIO
 fi 
 
-if [ "$CONFIG_PCI_LBA" = "y" ]; then
-   define_bool CONFIG_IOSAPIC y
-   define_bool CONFIG_IOMMU_SBA y
-fi
-
 source drivers/pci/Config.in
-
-bool 'Chassis LCD and LED support' CONFIG_CHASSIS_LCD_LED
 
 endmenu