From: Tomas Henzl Date: Tue, 17 Feb 2015 16:40:21 +0000 (+0100) Subject: cciss: remove duplicate entries from board_type struct X-Git-Tag: v4.2-rc1~147^2~98 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c854c38559c5b5f920c6ee6448c4a719cdd9ef1d;p=karo-tx-linux.git cciss: remove duplicate entries from board_type struct and devices not supported by this driver from unresettable list Signed-off-by: Tomas Henzl Acked-by: Don Brace Signed-off-by: James Bottomley --- diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index ff20f192b0f6..48498220cd6c 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -139,8 +139,6 @@ static struct board_type products[] = { {0x3214103C, "Smart Array E200i", &SA5_access}, {0x3215103C, "Smart Array E200i", &SA5_access}, {0x3237103C, "Smart Array E500", &SA5_access}, - {0x3223103C, "Smart Array P800", &SA5_access}, - {0x3234103C, "Smart Array P400", &SA5_access}, {0x323D103C, "Smart Array P700m", &SA5_access}, }; @@ -574,8 +572,6 @@ static void cciss_procinit(ctlr_info_t *h) /* List of controllers which cannot be hard reset on kexec with reset_devices */ static u32 unresettable_controller[] = { - 0x324a103C, /* Smart Array P712m */ - 0x324b103C, /* SmartArray P711m */ 0x3223103C, /* Smart Array P800 */ 0x3234103C, /* Smart Array P400 */ 0x3235103C, /* Smart Array P400i */