Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1883c5ab authored by Mike Miller's avatar Mike Miller Committed by Linus Torvalds
Browse files

[PATCH] cciss: version update, new hw 



Add support for new hardware and bumps the version to 3.6.10.  It seems
there were several changes introduced including soft_irq.  I decided to
bump the major number to reflect these changes.  Since we're still
supporting older vendor kernels I need some way differentiate between
kernel versions <=2.6.10 and newer kernels >=2.6.16.

Signed-off-by: default avatarMike Miller <mike.miller@hp.com>
Cc: Jens Axboe <axboe@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a2aa3e23

Documentation/cciss.txt

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ This driver is known to work with the following cards: 
	* SA P400i

	* SA E200

	* SA E200i

	* SA E500



If nodes are not already created in the /dev/cciss directory, run as root:

drivers/block/cciss.c

+6 −4
Original line number Diff line number Diff line
@@ -48,14 +48,14 @@ 
#include <linux/completion.h>



#define CCISS_DRIVER_VERSION(maj,min,submin) ((maj<<16)|(min<<8)|(submin))

#define DRIVER_NAME "HP CISS Driver (v 2.6.10)"

#define DRIVER_VERSION CCISS_DRIVER_VERSION(2,6,10)

#define DRIVER_NAME "HP CISS Driver (v 3.6.10)"

#define DRIVER_VERSION CCISS_DRIVER_VERSION(3,6,10)



/* Embedded module documentation macros - see modules.h */

MODULE_AUTHOR("Hewlett-Packard Company");

MODULE_DESCRIPTION("Driver for HP Controller SA5xxx SA6xxx version 2.6.10");

MODULE_DESCRIPTION("Driver for HP Controller SA5xxx SA6xxx version 3.6.10");

MODULE_SUPPORTED_DEVICE("HP SA5i SA5i+ SA532 SA5300 SA5312 SA641 SA642 SA6400"

			" SA6i P600 P800 P400 P400i E200 E200i");

			" SA6i P600 P800 P400 P400i E200 E200i E500");

MODULE_LICENSE("GPL");



#include "cciss_cmd.h"
@@ -82,6 +82,7 @@ static const struct pci_device_id cciss_pci_device_id[] = { 
	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSD,     0x103C, 0x3213},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSD,     0x103C, 0x3214},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSD,     0x103C, 0x3215},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSC,     0x103C, 0x3233},

	{0,}

};
@@ -110,6 +111,7 @@ static struct board_type products[] = { 
	{0x3213103C, "Smart Array E200i", &SA5_access},

	{0x3214103C, "Smart Array E200i", &SA5_access},

	{0x3215103C, "Smart Array E200i", &SA5_access},

	{0x3233103C, "Smart Array E500", &SA5_access},

};



/* How long to wait (in milliseconds) for board to go into simple mode */