diff -urN linux-2.2.26.orig/dc395/dc395-integ22.diff linux-2.2.26/dc395/dc395-integ22.diff --- linux-2.2.26.orig/dc395/dc395-integ22.diff Mon Feb 28 13:24:49 2000 +++ linux-2.2.26/dc395/dc395-integ22.diff Mon Nov 1 19:35:53 2004 @@ -116,13 +115,13 @@ extern void scsi_luns_setup(char *str, int *ints); extern void scsi_logging_setup(char *str, int *ints); extern void sound_setup(char *str, int *ints); -@@ -748,6 +749,9 @@ - #endif +@@ -905,6 +906,9 @@ #if defined(CONFIG_SCSI_DC390T) && ! defined(CONFIG_SCSI_DC390T_NOGENSUPP) - { "tmscsim=", dc390_setup }, -+#endif -+#if defined(CONFIG_SCSI_DC395x_TRMS1040) -+ { "dc395x_trm=", DC395x_trm_setup }, + { "tmscsim=", dc390_setup }, #endif ++#if defined(CONFIG_SCSI_DC395x_TRMS1040) ++ { "dc395x_trm=", DC395x_trm_setup }, ++#endif #ifdef CONFIG_BLK_DEV_XD { "xd=", xd_setup }, + { "xd_geo=", xd_manual_geo_init },