Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux

[cascardo/linux.git] / drivers / scsi / aic7xxx / aic7xxx_osm.h

diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.h b/drivers/scsi/aic7xxx/aic7xxx_osm.h
index bca0fb8..bc4cca9 100644 (file)
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.h
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.h
@@ -383,14 +383,6 @@ void ahc_insb(struct ahc_softc * ahc, long port,
 int            ahc_linux_register_host(struct ahc_softc *,
                                        struct scsi_host_template *);
 
-/*************************** Pretty Printing **********************************/
-struct info_str {
-       char *buffer;
-       int length;
-       off_t offset;
-       int pos;
-};
-
 /******************************** Locking *************************************/
 /* Lock protecting internal data structures */
 
@@ -523,8 +515,8 @@ ahc_flush_device_writes(struct ahc_softc *ahc)
 }
 
 /**************************** Proc FS Support *********************************/
-int    ahc_linux_proc_info(struct Scsi_Host *, char *, char **,
-                           off_t, int, int);
+int    ahc_proc_write_seeprom(struct Scsi_Host *, char *, int);
+int    ahc_linux_show_info(struct seq_file *, struct Scsi_Host *);
 
 /*************************** Domain Validation ********************************/
 /*********************** Transaction Access Wrappers *************************/