diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-13 10:00:22 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-13 10:00:22 -0500 |
| commit | 4de3a8e101150feaefa1139611a50ff37467f33e (patch) | |
| tree | daada742542518b02d7db7c5d32e715eaa5f166d /sound/isa/opti9xx/opti92x-ad1848.c | |
| parent | 294064f58953f9964e5945424b09c51800330a83 (diff) | |
| parent | 099469502f62fbe0d7e4f0b83a2f22538367f734 (diff) | |
Merge branch 'master' into fixes
Diffstat (limited to 'sound/isa/opti9xx/opti92x-ad1848.c')
| -rw-r--r-- | sound/isa/opti9xx/opti92x-ad1848.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c index 97871bebea90..babaedd242f7 100644 --- a/sound/isa/opti9xx/opti92x-ad1848.c +++ b/sound/isa/opti9xx/opti92x-ad1848.c | |||
| @@ -63,7 +63,7 @@ MODULE_SUPPORTED_DEVICE("{{OPTi,82C924 (AD1848)}," | |||
| 63 | 63 | ||
| 64 | static int index = SNDRV_DEFAULT_IDX1; /* Index 0-MAX */ | 64 | static int index = SNDRV_DEFAULT_IDX1; /* Index 0-MAX */ |
| 65 | static char *id = SNDRV_DEFAULT_STR1; /* ID for this card */ | 65 | static char *id = SNDRV_DEFAULT_STR1; /* ID for this card */ |
| 66 | //static int enable = SNDRV_DEFAULT_ENABLE1; /* Enable this card */ | 66 | //static bool enable = SNDRV_DEFAULT_ENABLE1; /* Enable this card */ |
| 67 | #ifdef CONFIG_PNP | 67 | #ifdef CONFIG_PNP |
| 68 | static int isapnp = 1; /* Enable ISA PnP detection */ | 68 | static int isapnp = 1; /* Enable ISA PnP detection */ |
| 69 | #endif | 69 | #endif |