diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-09 17:26:31 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-09 17:26:31 +0100 |
| commit | c7abc19ca6d48392f91ca04ebe1e9813b3ace435 (patch) | |
| tree | c23540ea1425e9891b39cdff550e90caaba38163 /include/linux/edac.h | |
| parent | d60990d597bfa2816dfe28a5c5c6787610b423e6 (diff) | |
| parent | c095ba7224d8edc71dcef0d655911399a8bd4a3f (diff) | |
Merge tag 'v3.11-rc4' into spi-bitbang
Linux 3.11-rc4
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 |