diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/edac/edac_device.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/edac/edac_device.c')
| -rw-r--r-- | drivers/edac/edac_device.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c index d5e13c94714f..a7408cf86f37 100644 --- a/drivers/edac/edac_device.c +++ b/drivers/edac/edac_device.c | |||
| @@ -672,7 +672,7 @@ void edac_device_handle_ce(struct edac_device_ctl_info *edac_dev, | |||
| 672 | block->counters.ce_count++; | 672 | block->counters.ce_count++; |
| 673 | } | 673 | } |
| 674 | 674 | ||
| 675 | /* Propogate the count up the 'totals' tree */ | 675 | /* Propagate the count up the 'totals' tree */ |
| 676 | instance->counters.ce_count++; | 676 | instance->counters.ce_count++; |
| 677 | edac_dev->counters.ce_count++; | 677 | edac_dev->counters.ce_count++; |
| 678 | 678 | ||
| @@ -718,7 +718,7 @@ void edac_device_handle_ue(struct edac_device_ctl_info *edac_dev, | |||
| 718 | block->counters.ue_count++; | 718 | block->counters.ue_count++; |
| 719 | } | 719 | } |
| 720 | 720 | ||
| 721 | /* Propogate the count up the 'totals' tree */ | 721 | /* Propagate the count up the 'totals' tree */ |
| 722 | instance->counters.ue_count++; | 722 | instance->counters.ue_count++; |
| 723 | edac_dev->counters.ue_count++; | 723 | edac_dev->counters.ue_count++; |
| 724 | 724 | ||