diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-31 03:17:34 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-31 03:17:34 -0400 |
| commit | a1744d3bee19d3b9cbfb825ab316a101b9c9f109 (patch) | |
| tree | c0e2324c09beca0eb5782eb5abf241ea2b7a4a11 /drivers/edac/Kconfig | |
| parent | 275f165fa970174f8a98205529750e8abb6c0a33 (diff) | |
| parent | a432226614c5616e3cfd211e0acffa0acfb4770c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/p54/p54common.c
Diffstat (limited to 'drivers/edac/Kconfig')
| -rw-r--r-- | drivers/edac/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig index 5a11e3cbcae2..e0dbd388757f 100644 --- a/drivers/edac/Kconfig +++ b/drivers/edac/Kconfig | |||
| @@ -102,6 +102,13 @@ config EDAC_I3000 | |||
| 102 | Support for error detection and correction on the Intel | 102 | Support for error detection and correction on the Intel |
| 103 | 3000 and 3010 server chipsets. | 103 | 3000 and 3010 server chipsets. |
| 104 | 104 | ||
| 105 | config EDAC_X38 | ||
| 106 | tristate "Intel X38" | ||
| 107 | depends on EDAC_MM_EDAC && PCI && X86 | ||
| 108 | help | ||
| 109 | Support for error detection and correction on the Intel | ||
| 110 | X38 server chipsets. | ||
| 111 | |||
| 105 | config EDAC_I82860 | 112 | config EDAC_I82860 |
| 106 | tristate "Intel 82860" | 113 | tristate "Intel 82860" |
| 107 | depends on EDAC_MM_EDAC && PCI && X86_32 | 114 | depends on EDAC_MM_EDAC && PCI && X86_32 |