quoted text > From: Stephen M. Cameron <scameron@beardog.cce.hp.com>
>
> We would prefer not to have any overlap between the two drivers.
> Remove the cciss_allow_hpsa option, as it it is no longer needed.
>
> Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
> ---
> drivers/block/cciss.c | 38 +-------------------------------------
> 1 files changed, 1 insertions(+), 37 deletions(-)
>
> diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
> index 5e4fadc..ca900ea 100644
> --- a/drivers/block/cciss.c
> +++ b/drivers/block/cciss.c
> @@ -66,12 +66,6 @@ MODULE_SUPPORTED_DEVICE("HP Smart Array Controllers");
> MODULE_VERSION("3.6.26");
> MODULE_LICENSE("GPL");
>
> -static int cciss_allow_hpsa;
> -module_param(cciss_allow_hpsa, int, S_IRUGO|S_IWUSR);
> -MODULE_PARM_DESC(cciss_allow_hpsa,
> - "Prevent cciss driver from accessing hardware known to be "
> - " supported by the hpsa driver");
> -
> #include "cciss_cmd.h"
> #include "cciss.h"
> #include <linux/cciss_ioctl.h>
> @@ -98,18 +92,6 @@ static const struct pci_device_id cciss_pci_device_id[] = {
> {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSD, 0x103C, 0x3215},
> {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSC, 0x103C, 0x3237},
> {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSC, 0x103C, 0x323D},
> - {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3241},
> - {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3243},
> - {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3245},
> - {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3247},
> - {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3249},
> - {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x324A},
> - {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x324B},
> - {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3250},
> - {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3251},
> - {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3252},
> - {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3253},
> - {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3254},
This hunk conflicts with the update Mike Miller sent
commit 6362beea8914cbd4630ccde3617d944aeca2d48f
Author: Mike Miller <mike.miller@hp.com>
Date: Tue Oct 19 09:40:34 2010 +0200
cciss: fix PCI IDs for new Smart Array controllers
And which is now mainline.
James
--
