From 226e01ef0da0b1a4c2c3922fb83ff3f9e4dfb508 Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Sun, 5 Feb 2012 01:27:44 +0100 Subject: ALSA: emu8000: Remove duplicate linux/moduleparam.h include from emu8000_patch.c The header 'linux/moduleparam.h' is included twice in 'sound/isa/sb/emu8000_patch.c'. Once is enough. Signed-off-by: Jesper Juhl Signed-off-by: Takashi Iwai --- sound/isa/sb/emu8000_patch.c | 1 - 1 file changed, 1 deletion(-) (limited to 'sound/isa') diff --git a/sound/isa/sb/emu8000_patch.c b/sound/isa/sb/emu8000_patch.c index e09f144177f5..c99c6078be33 100644 --- a/sound/isa/sb/emu8000_patch.c +++ b/sound/isa/sb/emu8000_patch.c @@ -22,7 +22,6 @@ #include "emu8000_local.h" #include #include -#include static int emu8000_reset_addr; module_param(emu8000_reset_addr, int, 0444); -- cgit v1.2.3 From c578ae0026da81a589245ee08e0fd1b1d8a55f4e Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Wed, 28 Mar 2012 18:26:17 -0700 Subject: ALSA: fix isa/opti9xx module param type Fix module parameter data type to eliminate build warnings. sound/isa/opti9xx/opti92x-ad1848.c:87:1: warning: return from incompatible pointer type sound/isa/opti9xx/opti92x-ad1848.c:87:1: warning: return from incompatible pointer type Signed-off-by: Randy Dunlap Signed-off-by: Takashi Iwai --- sound/isa/opti9xx/opti92x-ad1848.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sound/isa') diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c index babaedd242f7..d7ccf28bd66a 100644 --- a/sound/isa/opti9xx/opti92x-ad1848.c +++ b/sound/isa/opti9xx/opti92x-ad1848.c @@ -65,7 +65,7 @@ static int index = SNDRV_DEFAULT_IDX1; /* Index 0-MAX */ static char *id = SNDRV_DEFAULT_STR1; /* ID for this card */ //static bool enable = SNDRV_DEFAULT_ENABLE1; /* Enable this card */ #ifdef CONFIG_PNP -static int isapnp = 1; /* Enable ISA PnP detection */ +static bool isapnp = true; /* Enable ISA PnP detection */ #endif static long port = SNDRV_DEFAULT_PORT1; /* 0x530,0xe80,0xf40,0x604 */ static long mpu_port = SNDRV_DEFAULT_PORT1; /* 0x300,0x310,0x320,0x330 */ -- cgit v1.2.3