diff options
| author | Jan Kara <jack@suse.cz> | 2013-08-09 10:49:58 +0200 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2013-08-09 10:49:58 +0200 |
| commit | 97a2847d064e2fdd2e3cd4ff14cad2f377f0677a (patch) | |
| tree | e49ce105dc6febc25dc3ceba6070ea3998c7330c /include/linux/edac.h | |
| parent | e99a03c6f50a699d63b5751e3e88f84e43b037a7 (diff) | |
| parent | d2d0395fd1778d4bf714adc5bfd23a5d748d7802 (diff) | |
Merge branch 'for-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jeffm/linux-reiserfs into for_next_testing
Reiserfs locking fixes.
Diffstat (limited to 'include/linux/edac.h')
| -rw-r--r-- | include/linux/edac.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/edac.h b/include/linux/edac.h index 0b763276f619..5c6d7fbaf89e 100644 --- a/include/linux/edac.h +++ b/include/linux/edac.h @@ -622,7 +622,7 @@ struct edac_raw_error_desc { */ struct mem_ctl_info { struct device dev; - struct bus_type bus; + struct bus_type *bus; struct list_head link; /* for global list of mem_ctl_info structs */ @@ -742,4 +742,9 @@ struct mem_ctl_info { #endif }; +/* + * Maximum number of memory controllers in the coherent fabric. + */ +#define EDAC_MAX_MCS 16 + #endif |