diff options
author | H. Peter Anvin | 2012-05-30 21:11:26 +0200 |
---|---|---|
committer | H. Peter Anvin | 2012-05-30 21:11:32 +0200 |
commit | bbd771474ec44b516107685d77e1c80bbe09f141 (patch) | |
tree | 0cb15781539a68f27b4ea6c89f827282630cbce6 /drivers/edac/edac_module.h | |
parent | Merge branch 'x86/mce' into x86/urgent (diff) | |
parent | x86, realmode: Unbreak the ia64 build of drivers/acpi/sleep.c (diff) | |
download | kernel-qcow2-linux-bbd771474ec44b516107685d77e1c80bbe09f141.tar.gz kernel-qcow2-linux-bbd771474ec44b516107685d77e1c80bbe09f141.tar.xz kernel-qcow2-linux-bbd771474ec44b516107685d77e1c80bbe09f141.zip |
Merge branch 'x86/trampoline' into x86/urgent
x86/trampoline contains an urgent commit which is necessarily on a
newer baseline.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'drivers/edac/edac_module.h')
-rw-r--r-- | drivers/edac/edac_module.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/edac/edac_module.h b/drivers/edac/edac_module.h index 00f81b47a51f..0ea7d14cb930 100644 --- a/drivers/edac/edac_module.h +++ b/drivers/edac/edac_module.h @@ -50,7 +50,7 @@ extern void edac_device_reset_delay_period(struct edac_device_ctl_info *edac_dev, unsigned long value); extern void edac_mc_reset_delay_period(int value); -extern void *edac_align_ptr(void *ptr, unsigned size); +extern void *edac_align_ptr(void **p, unsigned size, int n_elems); /* * EDAC PCI functions |