Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

[linux.git] / sound / oss / trix.c

diff --git a/sound/oss/trix.c b/sound/oss/trix.c
index d1f1f154dcce5617d869489211f07baa637dd0b1..944e0c0154853d8fb31fe4cfa3fbf1b963a3137e 100644 (file)
--- a/sound/oss/trix.c
+++ b/sound/oss/trix.c
@@ -1,5 +1,5 @@
 /*
- * sound/trix.c
+ * sound/oss/trix.c
  *
  * Low level driver for the MediaTrix AudioTrix Pro
  * (MT-0002-PC Control Chip)
@@ -31,7 +31,7 @@
 
 static int mpu;
 
-static int joystick;
+static bool joystick;
 
 static unsigned char trix_read(int addr)
 {