diff options
author | Ingo Molnar | 2015-02-24 15:55:28 +0100 |
---|---|---|
committer | Ingo Molnar | 2015-02-24 15:55:28 +0100 |
commit | a1fb6696c662920f695c97591d759391aca8a1ad (patch) | |
tree | 25cc9ca4d1d291e122ff694dd41a9cc6d6513f60 /drivers/staging/comedi/kcomedilib/kcomedilib_main.c | |
parent | x86/mm/pat: Ensure different messages in STRICT_DEVMEM and PAT cases (diff) | |
parent | Linux 4.0-rc1 (diff) | |
download | kernel-qcow2-linux-a1fb6696c662920f695c97591d759391aca8a1ad.tar.gz kernel-qcow2-linux-a1fb6696c662920f695c97591d759391aca8a1ad.tar.xz kernel-qcow2-linux-a1fb6696c662920f695c97591d759391aca8a1ad.zip |
Merge tag 'v4.0-rc1' into x86/mm, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/staging/comedi/kcomedilib/kcomedilib_main.c')
-rw-r--r-- | drivers/staging/comedi/kcomedilib/kcomedilib_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/comedi/kcomedilib/kcomedilib_main.c b/drivers/staging/comedi/kcomedilib/kcomedilib_main.c index 8777f958c041..973f544e85e1 100644 --- a/drivers/staging/comedi/kcomedilib/kcomedilib_main.c +++ b/drivers/staging/comedi/kcomedilib/kcomedilib_main.c @@ -95,7 +95,7 @@ static int comedi_do_insn(struct comedi_device *dev, if (s->type == COMEDI_SUBD_UNUSED) { dev_err(dev->class_dev, - "%d not useable subdevice\n", insn->subdev); + "%d not usable subdevice\n", insn->subdev); ret = -EIO; goto error; } |