The patch titled
scsi: remove seagate.h
has been added to the -mm tree. Its filename is
scsi-remove-seagateh.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: scsi: remove seagate.h
From: Henrik Kretzschmar <henne@xxxxxxxxxxxxxxxx>
Removes seagate.h from the kernel tree.
Signed-off-by: Henrik Kretzschmar <henne@xxxxxxxxxxxxxxxx>
Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/scsi/Kconfig | 4 ++--
drivers/scsi/seagate.c | 2 +-
drivers/scsi/seagate.h | 19 -------------------
3 files changed, 3 insertions(+), 22 deletions(-)
diff -puN drivers/scsi/Kconfig~scsi-remove-seagateh drivers/scsi/Kconfig
--- a/drivers/scsi/Kconfig~scsi-remove-seagateh
+++ a/drivers/scsi/Kconfig
@@ -1283,8 +1283,8 @@ config SCSI_SEAGATE
These are 8-bit SCSI controllers; the ST-01 is also supported by
this driver. It is explained in section 3.9 of the SCSI-HOWTO,
available from <http://www.tldp.org/docs.html#howto>. If it
- doesn't work out of the box, you may have to change some settings in
- <file:drivers/scsi/seagate.h>.
+ doesn't work out of the box, you may have to change some macros at
+ compiletime, which are described in <file:drivers/scsi/seagate.c>.
To compile this driver as a module, choose M here: the
module will be called seagate.
diff -puN drivers/scsi/seagate.c~scsi-remove-seagateh drivers/scsi/seagate.c
--- a/drivers/scsi/seagate.c~scsi-remove-seagateh
+++ a/drivers/scsi/seagate.c
@@ -106,7 +106,6 @@
#include "scsi.h"
#include <scsi/scsi_dbg.h>
#include <scsi/scsi_host.h>
-#include "seagate.h"
#include <scsi/scsi_ioctl.h>
@@ -322,6 +321,7 @@ static Signature __initdata signatures[]
static int hostno = -1;
static void seagate_reconnect_intr (int, void *, struct pt_regs *);
static irqreturn_t do_seagate_reconnect_intr (int, void *, struct pt_regs *);
+static int seagate_st0x_bus_reset(Scsi_Cmnd *);
#ifdef FAST
static int fast = 1;
diff -puN drivers/scsi/seagate.h~scsi-remove-seagateh /dev/null
--- a/drivers/scsi/seagate.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * seagate.h Copyright (C) 1992 Drew Eckhardt
- * low level scsi driver header for ST01/ST02 by
- * Drew Eckhardt
- *
- * <drew@xxxxxxxxxxxx>
- */
-
-#ifndef _SEAGATE_H
-#define SEAGATE_H
-
-static int seagate_st0x_detect(struct scsi_host_template *);
-static int seagate_st0x_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
-
-static int seagate_st0x_abort(Scsi_Cmnd *);
-static const char *seagate_st0x_info(struct Scsi_Host *);
-static int seagate_st0x_bus_reset(Scsi_Cmnd *);
-
-#endif /* _SEAGATE_H */
_
Patches currently in -mm which might be from henne@xxxxxxxxxxxxxxxx are
git-libata-all.patch
kerneldoc-error-on-ata_piixc.patch
git-netdev-all.patch
git-net.patch
git-scsi-misc.patch
pci_module_init-conversion-in-scsi-subsys-2nd-try.patch
scsi-remove-seagateh.patch
scsi-seagate-scsi_cmnd-conversion.patch
gregkh-usb-usbcore-add-autosuspend-autoresume-infrastructure-2.patch
docbook-fix-segfault-in-docprocc.patch
pci_module_init-convertion-in-ata_genericc.patch
pci_module_init-convertion-in-ata_genericc-fix.patch
pci_module_init-convertion-in-amso1100-driver.patch
pci_module_init-convertion-for-k8_edacc.patch
pci_module_init-convertion-in-the-legacy-megaraid-driver.patch
nozomi-pci_module_init-conversion.patch
pci_module_init-convertion-in-olympicc.patch
pci_module_init-conversion-for-pata_pdc2027x.patch
pci_module_init-convertion-in-tmscsimc.patch
mark-pci_module_init-deprecated.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
