diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-09-24 23:15:15 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-09-24 23:15:15 -0400 |
| commit | c373ba999103fa794f041eab5bd490714d2dee88 (patch) | |
| tree | 8f2b445b1e0af2491c83527967dbcda76054a486 /drivers/edac/Makefile | |
| parent | 6f3529f00a0a9ac06413d18d3926adf099cb59af (diff) | |
| parent | 851b147e4411df6a1e7e90e2a609773c277eefd2 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/edac/Makefile')
| -rw-r--r-- | drivers/edac/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/edac/Makefile b/drivers/edac/Makefile index cfa033ce53a7..7a473bbe8abd 100644 --- a/drivers/edac/Makefile +++ b/drivers/edac/Makefile | |||
| @@ -32,6 +32,7 @@ obj-$(CONFIG_EDAC_I82443BXGX) += i82443bxgx_edac.o | |||
| 32 | obj-$(CONFIG_EDAC_I82875P) += i82875p_edac.o | 32 | obj-$(CONFIG_EDAC_I82875P) += i82875p_edac.o |
| 33 | obj-$(CONFIG_EDAC_I82975X) += i82975x_edac.o | 33 | obj-$(CONFIG_EDAC_I82975X) += i82975x_edac.o |
| 34 | obj-$(CONFIG_EDAC_I3000) += i3000_edac.o | 34 | obj-$(CONFIG_EDAC_I3000) += i3000_edac.o |
| 35 | obj-$(CONFIG_EDAC_I3200) += i3200_edac.o | ||
| 35 | obj-$(CONFIG_EDAC_X38) += x38_edac.o | 36 | obj-$(CONFIG_EDAC_X38) += x38_edac.o |
| 36 | obj-$(CONFIG_EDAC_I82860) += i82860_edac.o | 37 | obj-$(CONFIG_EDAC_I82860) += i82860_edac.o |
| 37 | obj-$(CONFIG_EDAC_R82600) += r82600_edac.o | 38 | obj-$(CONFIG_EDAC_R82600) += r82600_edac.o |
| @@ -49,3 +50,4 @@ obj-$(CONFIG_EDAC_CELL) += cell_edac.o | |||
| 49 | obj-$(CONFIG_EDAC_PPC4XX) += ppc4xx_edac.o | 50 | obj-$(CONFIG_EDAC_PPC4XX) += ppc4xx_edac.o |
| 50 | obj-$(CONFIG_EDAC_AMD8111) += amd8111_edac.o | 51 | obj-$(CONFIG_EDAC_AMD8111) += amd8111_edac.o |
| 51 | obj-$(CONFIG_EDAC_AMD8131) += amd8131_edac.o | 52 | obj-$(CONFIG_EDAC_AMD8131) += amd8131_edac.o |
| 53 | |||