summaryrefslogtreecommitdiffstats
path: root/drivers/s390/cio/device.c
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2013-09-26 21:05:54 +0200
committerJohn Stultz <john.stultz@linaro.org>2013-09-26 21:05:54 +0200
commit17deb9c2db01c7813611291d251d8c7dbdfd3c9d (patch)
tree6e023c0be7c64de84dd51a671eb09c5c82b56615 /drivers/s390/cio/device.c
parentclocksource: vf_pit_timer: Switch to sched_clock_register() (diff)
parentMerge branch 'fortglx/3.12/time' into fortglx/3.13/time (diff)
downloadlinux-17deb9c2db01c7813611291d251d8c7dbdfd3c9d.tar.xz
linux-17deb9c2db01c7813611291d251d8c7dbdfd3c9d.zip
Merge remote-tracking branch 'tip/timers/core' into fordlezcano/3.13/sched-clock64-conversion
Update to tip/timers/core and resolve minor conflict. Conflicts: drivers/clocksource/samsung_pwm_timer.c Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'drivers/s390/cio/device.c')
-rw-r--r--drivers/s390/cio/device.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 1ab5f6c36d9b..e4a7ab2bb629 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -564,7 +564,7 @@ static ssize_t online_store (struct device *dev, struct device_attribute *attr,
ret = 0;
} else {
force = 0;
- ret = strict_strtoul(buf, 16, &i);
+ ret = kstrtoul(buf, 16, &i);
}
if (ret)
goto out;