Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[pandora-kernel.git] / drivers / input / touchscreen / ili210x.c

diff --git a/drivers/input/touchscreen/ili210x.c b/drivers/input/touchscreen/ili210x.c
index cf0dc2f..ddf694b 100644 (file)
--- a/drivers/input/touchscreen/ili210x.c
+++ b/drivers/input/touchscreen/ili210x.c
@@ -216,7 +216,7 @@ static int ili210x_i2c_probe(struct i2c_client *client,
        /* get panel info */
        error = ili210x_read_reg(client, REG_PANEL_INFO, &panel, sizeof(panel));
        if (error) {
-               dev_err(dev, "Failed to get panel informations, err: %d\n",
+               dev_err(dev, "Failed to get panel information, err: %d\n",
                        error);
                return error;
        }
@@ -276,7 +276,7 @@ static int ili210x_i2c_probe(struct i2c_client *client,
 
        error = input_register_device(priv->input);
        if (error) {
-               dev_err(dev, "Cannot regiser input device, err: %d\n", error);
+               dev_err(dev, "Cannot register input device, err: %d\n", error);
                goto err_remove_sysfs;
        }