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/drivers/portman2x4.c | |
| parent | 294064f58953f9964e5945424b09c51800330a83 (diff) | |
| parent | 099469502f62fbe0d7e4f0b83a2f22538367f734 (diff) | |
Merge branch 'master' into fixes
Diffstat (limited to 'sound/drivers/portman2x4.c')
| -rw-r--r-- | sound/drivers/portman2x4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/drivers/portman2x4.c b/sound/drivers/portman2x4.c index f664823a9635..3e32bd3d95d9 100644 --- a/sound/drivers/portman2x4.c +++ b/sound/drivers/portman2x4.c | |||
| @@ -55,7 +55,7 @@ | |||
| 55 | 55 | ||
| 56 | static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; | 56 | static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; |
| 57 | static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; | 57 | static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; |
| 58 | static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; | 58 | static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; |
| 59 | 59 | ||
| 60 | static struct platform_device *platform_devices[SNDRV_CARDS]; | 60 | static struct platform_device *platform_devices[SNDRV_CARDS]; |
| 61 | static int device_count; | 61 | static int device_count; |