Subject: [PATCH 4/5] Updates for WRS SBC82xx boards

From: Paul Gortmaker <[email-masked]>
Date: Thu, 25 May 2006 14:30:38 -0400

patch4: sbc82xx-mchk-pci9.diff1
	- restore machine check disable for PCI9 that was in earlier
	  m8260_pci.c

Signed-off-by: Paul Gortmaker <[email-masked]>

--- linux-2.6.16_rc5/arch/ppc/syslib/m82xx_pci.c.orig	2006-02-27 15:02:01.000000000 -0500
+++ linux-2.6.16_rc5/arch/ppc/syslib/m82xx_pci.c	2006-02-27 16:05:20.000000000 -0500
@@ -227,6 +227,11 @@
 	immap->im_memctl.memc_pcibr1  = M82xx_PCI_SEC_WND_BASE | PCIBR_ENABLE;
 #endif
 
+#ifdef CONFIG_8260_PCI9 
+	/* Disable machine check on no response or target abort */
+        immap->im_pci.pci_emr = cpu_to_le32(0x1fe7);
+#endif
+
 #if defined CONFIG_ADS8272
 	immap->im_siu_conf.siu_82xx.sc_siumcr =
 		(immap->im_siu_conf.siu_82xx.sc_siumcr &