--- zzzz-none-000/linux-2.6.19.2/drivers/scsi/aic7xxx/aic7xxx.h	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/drivers/scsi/aic7xxx/aic7xxx.h	2007-01-11 07:38:19.000000000 +0000
@@ -54,6 +54,14 @@
 struct seeprom_descriptor;
 
 /****************************** Useful Macros *********************************/
+#ifndef MAX
+#define MAX(a,b) (((a) > (b)) ? (a) : (b))
+#endif
+
+#ifndef MIN
+#define MIN(a,b) (((a) < (b)) ? (a) : (b))
+#endif
+
 #ifndef TRUE
 #define TRUE 1
 #endif
@@ -1127,6 +1135,8 @@
 	char			*name;
 	ahc_device_setup_t	*setup;
 };
+extern struct ahc_pci_identity ahc_pci_ident_table[];
+extern const u_int ahc_num_pci_devs;
 
 /***************************** VL/EISA Declarations ***************************/
 struct aic7770_identity {
@@ -1279,7 +1289,6 @@
 } ahc_queue_alg;
 
 void			ahc_set_tags(struct ahc_softc *ahc,
-				     struct scsi_cmnd *cmd,
 				     struct ahc_devinfo *devinfo,
 				     ahc_queue_alg alg);