diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-01-12 09:59:14 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-01-12 09:59:14 +0100 |
| commit | 627b79628f56c3deeb17dec1edf6899b49552fa4 (patch) | |
| tree | deac8b2cce5d70708fa944a270ee031f069226d8 /sound/oss/trix.c | |
| parent | 29abceb67f8a230da806db4ed73899595bd2ae76 (diff) | |
| parent | 8c3f5d8a9b7d0d8506bc2a0525e012eae02b1853 (diff) | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/oss/trix.c')
| -rw-r--r-- | sound/oss/trix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/trix.c b/sound/oss/trix.c index e04169e8e3f..944e0c01548 100644 --- a/sound/oss/trix.c +++ b/sound/oss/trix.c @@ -31,7 +31,7 @@ static int mpu; -static int joystick; +static bool joystick; static unsigned char trix_read(int addr) { |