Merge branch 'for-3.17/drivers' of git://git.kernel.dk/linux-block

[sfrench/cifs-2.6.git] / arch / arm / mach-pxa / balloon3.c

diff --git a/arch/arm/mach-pxa/balloon3.c b/arch/arm/mach-pxa/balloon3.c
index 43596e0ed0515597ee786da610eaf22683e8f3f8..d897292712ebe722df54463a3db9a0bb04d36dc1 100644 (file)
--- a/arch/arm/mach-pxa/balloon3.c
+++ b/arch/arm/mach-pxa/balloon3.c
@@ -90,7 +90,7 @@ int __init parse_balloon3_features(char *arg)
        if (!arg)
                return 0;
 
-       return strict_strtoul(arg, 0, &balloon3_features_present);
+       return kstrtoul(arg, 0, &balloon3_features_present);
 }
 early_param("balloon3_features", parse_balloon3_features);