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/pas2_card.c | |
| parent | Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/broon... (diff) | |
| parent | ALSA: usb-audio: add Yamaha MOX6/MOX8 support (diff) | |
| download | linux-627b79628f56c3deeb17dec1edf6899b49552fa4.tar.gz linux-627b79628f56c3deeb17dec1edf6899b49552fa4.tar.bz2 linux-627b79628f56c3deeb17dec1edf6899b49552fa4.zip | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/oss/pas2_card.c')
| -rw-r--r-- | sound/oss/pas2_card.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/oss/pas2_card.c b/sound/oss/pas2_card.c index 7f377ec3486d..dabf8a871dcc 100644 --- a/sound/oss/pas2_card.c +++ b/sound/oss/pas2_card.c @@ -41,19 +41,19 @@ static int pas_irq; static int pas_sb_base; DEFINE_SPINLOCK(pas_lock); #ifndef CONFIG_PAS_JOYSTICK -static int joystick; +static bool joystick; #else -static int joystick = 1; +static bool joystick = 1; #endif #ifdef SYMPHONY_PAS -static int symphony = 1; +static bool symphony = 1; #else -static int symphony; +static bool symphony; #endif #ifdef BROKEN_BUS_CLOCK -static int broken_bus_clock = 1; +static bool broken_bus_clock = 1; #else -static int broken_bus_clock; +static bool broken_bus_clock; #endif static struct address_info cfg; |