Merge tag 'driver-core-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / include / linux / edac.h

diff --git a/include/linux/edac.h b/include/linux/edac.h
index 7c6b7ba55589439ed09b1a6bde868bc1b82fa3f2..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];
        bool fake_inject_ue;
        u16 fake_inject_count;
-#endif
 };
 
 /*