From: Andrew Morton <akpm@osdl.org>

Cc: Sumant Patro <Sumant.Patro@lsil.com>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/scsi/megaraid/megaraid_sas.c |    1 +
 scsi/megaraid/megaraid_sas.h         |    0 
 2 files changed, 1 insertion(+)

diff -puN Documentation/scsi/ChangeLog.megaraid_sas~megaraid_sas-add-support-for-zcr-controller-fix Documentation/scsi/ChangeLog.megaraid_sas
diff -puN drivers/scsi/megaraid/megaraid_sas.c~megaraid_sas-add-support-for-zcr-controller-fix drivers/scsi/megaraid/megaraid_sas.c
--- devel/drivers/scsi/megaraid/megaraid_sas.c~megaraid_sas-add-support-for-zcr-controller-fix	2006-05-29 20:28:27.000000000 -0700
+++ devel-akpm/drivers/scsi/megaraid/megaraid_sas.c	2006-05-29 20:28:27.000000000 -0700
@@ -65,6 +65,7 @@ static struct pci_device_id megasas_pci_
 	 PCI_ANY_ID,
 	 PCI_ANY_ID,
 	},
+	{
 	 PCI_VENDOR_ID_LSI_LOGIC,
 	 PCI_DEVICE_ID_LSI_VERDE_ZCR,	/* xscale IOP, vega */
 	 PCI_ANY_ID,
diff -puN drivers/scsi/megaraid/megaraid_sas.h~megaraid_sas-add-support-for-zcr-controller-fix drivers/scsi/megaraid/megaraid_sas.h
_