diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2013-06-28 12:01:28 +0200 |
|---|---|---|
| committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2013-06-28 12:01:28 +0200 |
| commit | 19fd7441e9cc29b6c6d73c5469b3c93aa245fbb5 (patch) | |
| tree | ab5e98ae677baecab3155b34983d97ffd08281c0 /drivers/video/omap2/displays | |
| parent | Merge tag 'omapdss-for-3.11-2' of git://gitorious.org/linux-omap-dss2/linux i... (diff) | |
| parent | video: i740fb: Make i740fb_init static (diff) | |
| download | linux-19fd7441e9cc29b6c6d73c5469b3c93aa245fbb5.tar.xz linux-19fd7441e9cc29b6c6d73c5469b3c93aa245fbb5.zip | |
Merge tag 'fbdev-3.11-2' of git://gitorious.org/linux-omap-dss2/linux into fbdev/for-next
Various fbdev changes for 3.11
* xilinxfb updates
* Small cleanups and fixes to multiple drivers
Diffstat (limited to 'drivers/video/omap2/displays')
| -rw-r--r-- | drivers/video/omap2/displays/panel-taal.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/omap2/displays/panel-taal.c b/drivers/video/omap2/displays/panel-taal.c index c731d3c068b4..54a07da8587a 100644 --- a/drivers/video/omap2/displays/panel-taal.c +++ b/drivers/video/omap2/displays/panel-taal.c @@ -573,7 +573,7 @@ static ssize_t taal_store_esd_interval(struct device *dev, unsigned long t; int r; - r = strict_strtoul(buf, 10, &t); + r = kstrtoul(buf, 10, &t); if (r) return r; @@ -611,7 +611,7 @@ static ssize_t taal_store_ulps(struct device *dev, unsigned long t; int r; - r = strict_strtoul(buf, 10, &t); + r = kstrtoul(buf, 10, &t); if (r) return r; @@ -660,7 +660,7 @@ static ssize_t taal_store_ulps_timeout(struct device *dev, unsigned long t; int r; - r = strict_strtoul(buf, 10, &t); + r = kstrtoul(buf, 10, &t); if (r) return r; |