aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Jackson <Andrew.Jackson@arm.com>2015-01-27 20:38:28 +0000
committerJon Medhurst <tixy@linaro.org>2015-06-17 11:59:56 +0100
commit3fe89f1753f39a021d298efc265f4dcf19da8dfc (patch)
tree20c3ba2ceb84a93f5fb0b1a39e167b5ab4147df8
parente82935cfa9f7950599e39fda9248c1d8e106f2ab (diff)
ASoC: dwc: Remove unnecessary conditional compilation
of_match_ptr is already conditionally compiled based on CONFIG_OF so further conditional compilation is not required. Remove conditional compilation surrounding of_match_ptr. Signed-off-by: Andrew Jackson <Andrew.Jackson@arm.com> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit acae254a8e08b9406e62d456000ebd1573af0cb6) Signed-off-by: Jon Medhurst <tixy@linaro.org>
-rw-r--r--sound/soc/dwc/designware_i2s.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/dwc/designware_i2s.c b/sound/soc/dwc/designware_i2s.c
index 71f3fbbefaa2..0e697151a246 100644
--- a/sound/soc/dwc/designware_i2s.c
+++ b/sound/soc/dwc/designware_i2s.c
@@ -611,9 +611,7 @@ static struct platform_driver dw_i2s_driver = {
.driver = {
.name = "designware-i2s",
.owner = THIS_MODULE,
-#ifdef CONFIG_OF
.of_match_table = of_match_ptr(dw_i2s_of_match),
-#endif
},
};