fix aacraid patch for 2.6.21, 2.6.21.5-rc2

diff --git a/review-2.6.21/aacraid-correct-sa-platform-support.patch b/review-2.6.21/aacraid-correct-sa-platform-support.patch
index 67bdfb82bd4d625603d12fb376eb1a8491d91c14..9675e354c93d839020795dff7294cf0378a54b57 100644 (file)
--- a/review-2.6.21/aacraid-correct-sa-platform-support.patch
+++ b/review-2.6.21/aacraid-correct-sa-platform-support.patch
@@ -22,13 +22,14 @@ problem.
 Signed-off-by: Mark Salyzyn <aacraid@adaptec.com>
 Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+[chrisw: backport to 2.6.21.4]
 Signed-off-by: Chris Wright <chrisw@sous-sol.org>
 
 ---
  drivers/scsi/aacraid/aacraid.h |    1 +
  drivers/scsi/aacraid/rx.c      |    2 +-
- drivers/scsi/aacraid/sa.c      |    9 ++++++++-
- 3 files changed, 10 insertions(+), 2 deletions(-)
+ drivers/scsi/aacraid/sa.c      |    3 ++-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
 
 --- linux-2.6.21.4.orig/drivers/scsi/aacraid/aacraid.h
 +++ linux-2.6.21.4/drivers/scsi/aacraid/aacraid.h
@@ -62,23 +63,9 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
   *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
-@@ -258,6 +258,11 @@ static void aac_sa_start_adapter(struct 
-                       NULL, NULL, NULL, NULL, NULL);
- }
- 
-+static int aac_sa_restart_adapter(struct aac_dev *dev, int bled)
-+{
-+      return -EINVAL;
-+}
-+
- /**
-  *    aac_sa_check_health
-  *    @dev: device to check if healthy
-@@ -367,7 +372,9 @@ int aac_sa_init(struct aac_dev *dev)
-       dev->a_ops.adapter_notify = aac_sa_notify_adapter;
+@@ -368,6 +368,7 @@ int aac_sa_init(struct aac_dev *dev)
        dev->a_ops.adapter_sync_cmd = sa_sync_cmd;
        dev->a_ops.adapter_check_health = aac_sa_check_health;
-+      dev->a_ops.adapter_restart = aac_sa_restart_adapter;
        dev->a_ops.adapter_intr = aac_sa_intr;
 +      dev->a_ops.adapter_deliver = aac_rx_deliver_producer;
        dev->a_ops.adapter_ioremap = aac_sa_ioremap;