Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[~andy/linux] / drivers / staging / media / lirc / lirc_serial.c

diff --git a/drivers/staging/media/lirc/lirc_serial.c b/drivers/staging/media/lirc/lirc_serial.c
index 0ca308a1183cd5da08e8f490a850b115eec602b0..8dd8897ad86028da33ce68991fed3c302c4dcc2a 100644 (file)
--- a/drivers/staging/media/lirc/lirc_serial.c
+++ b/drivers/staging/media/lirc/lirc_serial.c
@@ -107,13 +107,13 @@ struct lirc_serial {
 static int type;
 static int io;
 static int irq;
-static int iommap;
+static bool iommap;
 static int ioshift;
-static int softcarrier = 1;
-static int share_irq;
-static int debug;
+static bool softcarrier = 1;
+static bool share_irq;
+static bool debug;
 static int sense = -1; /* -1 = auto, 0 = active high, 1 = active low */
-static int txsense;    /* 0 = active high, 1 = active low */
+static bool txsense;   /* 0 = active high, 1 = active low */
 
 #define dprintk(fmt, args...)                                  \
        do {                                                    \