diff options
| -rw-r--r-- | sound/soc/samsung/smdk_wm8994.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/samsung/smdk_wm8994.c b/sound/soc/samsung/smdk_wm8994.c index b072bd107b31..d38ae98e2f32 100644 --- a/sound/soc/samsung/smdk_wm8994.c +++ b/sound/soc/samsung/smdk_wm8994.c | |||
| @@ -152,13 +152,11 @@ static struct snd_soc_card smdk = { | |||
| 152 | .num_links = ARRAY_SIZE(smdk_dai), | 152 | .num_links = ARRAY_SIZE(smdk_dai), |
| 153 | }; | 153 | }; |
| 154 | 154 | ||
| 155 | #ifdef CONFIG_OF | ||
| 156 | static const struct of_device_id samsung_wm8994_of_match[] = { | 155 | static const struct of_device_id samsung_wm8994_of_match[] = { |
| 157 | { .compatible = "samsung,smdk-wm8994", .data = &smdk_board_data }, | 156 | { .compatible = "samsung,smdk-wm8994", .data = &smdk_board_data }, |
| 158 | {}, | 157 | {}, |
| 159 | }; | 158 | }; |
| 160 | MODULE_DEVICE_TABLE(of, samsung_wm8994_of_match); | 159 | MODULE_DEVICE_TABLE(of, samsung_wm8994_of_match); |
| 161 | #endif /* CONFIG_OF */ | ||
| 162 | 160 | ||
| 163 | static int smdk_audio_probe(struct platform_device *pdev) | 161 | static int smdk_audio_probe(struct platform_device *pdev) |
| 164 | { | 162 | { |
| @@ -188,7 +186,7 @@ static int smdk_audio_probe(struct platform_device *pdev) | |||
| 188 | smdk_dai[0].platform_of_node = smdk_dai[0].cpu_of_node; | 186 | smdk_dai[0].platform_of_node = smdk_dai[0].cpu_of_node; |
| 189 | } | 187 | } |
| 190 | 188 | ||
| 191 | id = of_match_device(samsung_wm8994_of_match, &pdev->dev); | 189 | id = of_match_device(of_match_ptr(samsung_wm8994_of_match), &pdev->dev); |
| 192 | if (id) | 190 | if (id) |
| 193 | *board = *((struct smdk_wm8994_data *)id->data); | 191 | *board = *((struct smdk_wm8994_data *)id->data); |
| 194 | 192 | ||
