Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[sfrench/cifs-2.6.git] / drivers / scsi / st.c

diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index baada5b50bb1194d6905c90598a587f4931d8bc9..e3266a64a4770a940a93f2a0b66dfbb446db81cd 100644 (file)
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -228,7 +228,6 @@ static DEFINE_IDR(st_index_idr);
 
 
 \f
-#include "osst_detect.h"
 #ifndef SIGS_FROM_OSST
 #define SIGS_FROM_OSST \
        {"OnStream", "SC-", "", "osst"}, \
@@ -4267,9 +4266,10 @@ static int st_probe(struct device *dev)
        if (SDp->type != TYPE_TAPE)
                return -ENODEV;
        if ((stp = st_incompatible(SDp))) {
-               sdev_printk(KERN_INFO, SDp, "Found incompatible tape\n");
                sdev_printk(KERN_INFO, SDp,
-                           "st: The suggested driver is %s.\n", stp);
+                           "OnStream tapes are no longer supported;\n");
+               sdev_printk(KERN_INFO, SDp,
+                           "please mail to linux-scsi@vger.kernel.org.\n");
                return -ENODEV;
        }