Merge tag 'mfd-for-linus-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

[mirror_ubuntu-zesty-kernel.git] / include / linux / edac.h

diff --git a/include/linux/edac.h b/include/linux/edac.h
index da3b72e95db3cb0ba734ff736ad94aab6fd5b175..4fe67b853de042d3fcc45910ab929fb320aab33f 100644 (file)
--- a/include/linux/edac.h
+++ b/include/linux/edac.h
@@ -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
 };
 
 /*