From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 5 Nov 2015 03:36:09 +0000 (+1100)
Subject: Merge remote-tracking branch 'driver-core/driver-core-next'
X-Git-Tag: KARO-TXUL-2015-12-04~54
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=dda7e4875ba873a2a05ac533c8bf149ec0aac993

Merge remote-tracking branch 'driver-core/driver-core-next'
---

dda7e4875ba873a2a05ac533c8bf149ec0aac993
diff --cc include/linux/edac.h
index b3d87e5822f8,7c6b7ba55589..4fe67b853de0
--- a/include/linux/edac.h
+++ b/include/linux/edac.h
@@@ -769,10 -769,12 +769,10 @@@ struct mem_ctl_info 
  	/* the internal state of this controller instance */
  	int op_state;
  
 -#ifdef CONFIG_EDAC_DEBUG
  	struct dentry *debugfs;
  	u8 fake_inject_layer[EDAC_MAX_LAYERS];
- 	u32 fake_inject_ue;
+ 	bool fake_inject_ue;
  	u16 fake_inject_count;
 -#endif
  };
  
  /*