diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-09-11 09:02:36 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-09-11 09:02:36 -0700 |
| commit | 53431d0a3534263168c8ee576bad1c2c3a4cd9e0 (patch) | |
| tree | 84b3dda2e2409d1eda7c2273053c78cd6aa3a677 /drivers/input/serio | |
| parent | 01b944fe1cd4e21a2a9ed51adbdbafe2d5e905ba (diff) | |
| parent | ade9c1a47c811a7ae1c874882ad9178af1ed1098 (diff) | |
| download | linux-53431d0a3534263168c8ee576bad1c2c3a4cd9e0.tar.bz2 | |
Merge branch 'next' into for-linus
Prepare second round of input updates for 4.3 merge window.
Diffstat (limited to 'drivers/input/serio')
| -rw-r--r-- | drivers/input/serio/i8042.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c index c9c98f0ab284..db91de539ee3 100644 --- a/drivers/input/serio/i8042.c +++ b/drivers/input/serio/i8042.c @@ -877,7 +877,7 @@ static int __init i8042_check_aux(void) static int i8042_controller_check(void) { if (i8042_flush()) { - pr_err("No controller found\n"); + pr_info("No controller found\n"); return -ENODEV; } |