From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Tue, 17 Jan 2012 07:31:13 +0000 (+0300)
Subject: Staging: comedi: logical || vs bitwise |
X-Git-Tag: v3.4-rc1~186^2~176^2~44
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cba2c99363beb532c29f9aebf5b22878d88bcb93;p=pandora-kernel.git

Staging: comedi: logical || vs bitwise |

These are bitfields and the intend was to OR them together.  A logical
OR here is simply 1.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

Reading git-diff-tree failed