diff options
| author | Takashi Iwai | 2012-01-12 09:59:14 +0100 |
|---|---|---|
| committer | Takashi Iwai | 2012-01-12 09:59:14 +0100 |
| commit | 627b79628f56c3deeb17dec1edf6899b49552fa4 (patch) | |
| tree | deac8b2cce5d70708fa944a270ee031f069226d8 /sound/pci/via82xx.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 | kernel-qcow2-linux-627b79628f56c3deeb17dec1edf6899b49552fa4.tar.gz kernel-qcow2-linux-627b79628f56c3deeb17dec1edf6899b49552fa4.tar.xz kernel-qcow2-linux-627b79628f56c3deeb17dec1edf6899b49552fa4.zip | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/pci/via82xx.c')
| -rw-r--r-- | sound/pci/via82xx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c index ae98d56d05bd..75630408c6db 100644 --- a/sound/pci/via82xx.c +++ b/sound/pci/via82xx.c @@ -80,7 +80,7 @@ static int index = SNDRV_DEFAULT_IDX1; /* Index 0-MAX */ static char *id = SNDRV_DEFAULT_STR1; /* ID for this card */ static long mpu_port; #ifdef SUPPORT_JOYSTICK -static int joystick; +static bool joystick; #endif static int ac97_clock = 48000; static char *ac97_quirk; @@ -110,7 +110,7 @@ module_param(nodelay, int, 0444); MODULE_PARM_DESC(nodelay, "Disable 500ms init delay"); /* just for backward compatibility */ -static int enable; +static bool enable; module_param(enable, bool, 0444); |