The patch titled
cciss: supercedes add shutdown support
has been removed from the -mm tree. Its filename was
cciss-supercedes-add-shutdown-support-replaces-reboot-notifier.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
Subject: cciss: supercedes add shutdown support
From: "Mike Miller (OS Dev)" <mikem@xxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Mike Miller <mike.miller@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/block/cciss.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff -puN drivers/block/cciss.c~cciss-supercedes-add-shutdown-support-replaces-reboot-notifier drivers/block/cciss.c
--- a/drivers/block/cciss.c~cciss-supercedes-add-shutdown-support-replaces-reboot-notifier
+++ a/drivers/block/cciss.c
@@ -3404,7 +3404,7 @@ static int __devinit cciss_init_one(stru
return -1;
}
-static void __devexit cciss_remove_one(struct pci_dev *pdev)
+static void cciss_remove_one(struct pci_dev *pdev)
{
ctlr_info_t *tmp_ptr;
int i, j;
@@ -3429,8 +3429,7 @@ static void __devexit cciss_remove_one(s
return_code = sendcmd(CCISS_CACHE_FLUSH, i, flush_buf, 4, 0, 0, 0, NULL,
TYPE_CMD);
if (return_code != IO_OK) {
- printk(KERN_WARNING "Error Flushing cache on controller %d\n",
- i);
+ printk(KERN_WARNING "Error flushing cache on controller %d\n", i);
}
free_irq(hba[i]->intr[2], hba[i]);
@@ -3481,6 +3480,7 @@ static struct pci_driver cciss_pci_drive
.probe = cciss_init_one,
.remove = __devexit_p(cciss_remove_one),
.id_table = cciss_pci_device_id, /* id_table */
+ .shutdown = cciss_remove_one,
};
/*
_
Patches currently in -mm which might be from mikem@xxxxxxxxxxxxxxxxxxxxxxx are
cciss-fix-for-2tb-support.patch
cciss-supercedes-add-shutdown-support-replaces-reboot-notifier.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
