diff --git a/[refs] b/[refs] index 5ff9c41f4f5c..edea9f18db14 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c66b5a79a9348ccd6d1cd81416027d0e12da965d +refs/heads/master: c2c93dbc97622e26dc19edc71e50ebaa996d7804 diff --git a/trunk/include/linux/edac.h b/trunk/include/linux/edac.h index 1b7744c219b8..ff18efc754f3 100644 --- a/trunk/include/linux/edac.h +++ b/trunk/include/linux/edac.h @@ -48,7 +48,6 @@ static inline void opstate_init(void) } #define EDAC_MC_LABEL_LEN 31 -#define MC_PROC_NAME_MAX_LEN 7 /** * enum dev_type - describe the type of memory DRAM chips used at the stick @@ -633,7 +632,6 @@ struct mem_ctl_info { const char *mod_ver; const char *ctl_name; const char *dev_name; - char proc_name[MC_PROC_NAME_MAX_LEN + 1]; void *pvt_info; unsigned long start_time; /* mci load start time (in jiffies) */