diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-17 21:38:27 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-17 21:38:27 -0700 |
commit | 49dc2b7173010792c6923930ffcee84b7094b7de (patch) | |
tree | 439899abc82e7413b3bee6d52823d5350d7f2245 /drivers/input/touchscreen | |
parent | d66435cc7da95964cb386674bd82ec12ca66320a (diff) | |
parent | d00cd819d7dfb1a24d814457f47ff4d6c7be152c (diff) | |
download | blackbird-op-linux-49dc2b7173010792c6923930ffcee84b7094b7de.tar.gz blackbird-op-linux-49dc2b7173010792c6923930ffcee84b7094b7de.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
drivers/rtc: broken link fix
drm/i915 Fix typos in i915_gem_fence.c
Docs: fix missing word in REPORTING-BUGS
lib+mm: fix few spelling mistakes
MAINTAINERS: add git URL for APM driver
treewide: Fix typo in printk
Diffstat (limited to 'drivers/input/touchscreen')
-rw-r--r-- | drivers/input/touchscreen/wdt87xx_i2c.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/wdt87xx_i2c.c b/drivers/input/touchscreen/wdt87xx_i2c.c index 515c20a6e10f..73861ad22df4 100644 --- a/drivers/input/touchscreen/wdt87xx_i2c.c +++ b/drivers/input/touchscreen/wdt87xx_i2c.c @@ -848,7 +848,7 @@ static int wdt87xx_do_update_firmware(struct i2c_client *client, error = wdt87xx_get_sysparam(client, &wdt->param); if (error) dev_err(&client->dev, - "failed to refresh system paramaters: %d\n", error); + "failed to refresh system parameters: %d\n", error); out: enable_irq(client->irq); mutex_unlock(&wdt->fw_mutex); |