VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / drivers / scsi / aic7xxx / aic7xxx_osm.h

diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.h b/drivers/scsi/aic7xxx/aic7xxx_osm.h
index 12f040d..f9c21e7 100644 (file)
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.h
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.h
@@ -85,7 +85,7 @@
 /* Core SCSI definitions */
 #define AIC_LIB_PREFIX ahc
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 /* Name space conflict with BSD queue macros */
 #ifdef LIST_HEAD
@@ -840,11 +840,17 @@ typedef enum
 
 #ifdef CONFIG_EISA
 extern uint32_t aic7xxx_probe_eisa_vl;
-void                    ahc_linux_eisa_init(void);
+int                     ahc_linux_eisa_init(void);
 void                    ahc_linux_eisa_exit(void);
 int                     aic7770_map_registers(struct ahc_softc *ahc,
                                               u_int port);
 int                     aic7770_map_int(struct ahc_softc *ahc, u_int irq);
+#else
+static inline int      ahc_linux_eisa_init(void) {
+       return -ENODEV;
+}
+static inline void     ahc_linux_eisa_exit(void) {
+}
 #endif
 
 /******************************* PCI Routines *********************************/
@@ -932,6 +938,12 @@ ahc_get_pci_bus(ahc_dev_softc_t pci)
 {
        return (pci->bus->number);
 }
+#else
+static inline int ahc_linux_pci_init(void) {
+       return 0;
+}
+static inline void ahc_linux_pci_exit(void) {
+}
 #endif
 
 static __inline void ahc_flush_device_writes(struct ahc_softc *);