Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[cascardo/linux.git] / drivers / edac / mce_amd_inj.c

diff --git a/drivers/edac/mce_amd_inj.c b/drivers/edac/mce_amd_inj.c
index 2ae78f2..5e46a9f 100644 (file)
--- a/drivers/edac/mce_amd_inj.c
+++ b/drivers/edac/mce_amd_inj.c
@@ -43,7 +43,7 @@ static ssize_t edac_inject_##reg##_store(struct kobject *kobj,                \
        int ret = 0;                                                    \
        unsigned long value;                                            \
                                                                        \
-       ret = strict_strtoul(data, 16, &value);                         \
+       ret = kstrtoul(data, 16, &value);                               \
        if (ret < 0)                                                    \
                printk(KERN_ERR "Error writing MCE " #reg " field.\n"); \
                                                                        \
@@ -83,7 +83,7 @@ static ssize_t edac_inject_bank_store(struct kobject *kobj,
        int ret = 0;
        unsigned long value;
 
-       ret = strict_strtoul(data, 10, &value);
+       ret = kstrtoul(data, 10, &value);
        if (ret < 0) {
                printk(KERN_ERR "Invalid bank value!\n");
                return -EINVAL;