diff options
| author | Mark Brown | 2020-12-11 17:48:04 +0000 |
|---|---|---|
| committer | Mark Brown | 2020-12-11 17:48:04 +0000 |
| commit | 460aa020f56c974a3e7e5b5378b2355fec6a2c11 (patch) | |
| tree | 959dc05609eec2a040245f43964ae5738ee741cb /sound/soc/codecs/max98926.c | |
| parent | 031616c434db05ce766f76c62865f55698e0924f (diff) | |
| parent | 84de089e770b57280d87dff51be894b6fda18810 (diff) | |
Merge remote-tracking branch 'asoc/for-5.11' into asoc-next
Diffstat (limited to 'sound/soc/codecs/max98926.c')
| -rw-r--r-- | sound/soc/codecs/max98926.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/max98926.c b/sound/soc/codecs/max98926.c index c4dfa8ab1d49..f286e572263e 100644 --- a/sound/soc/codecs/max98926.c +++ b/sound/soc/codecs/max98926.c @@ -571,17 +571,18 @@ static const struct i2c_device_id max98926_i2c_id[] = { }; MODULE_DEVICE_TABLE(i2c, max98926_i2c_id); +#ifdef CONFIG_OF static const struct of_device_id max98926_of_match[] = { { .compatible = "maxim,max98926", }, { } }; MODULE_DEVICE_TABLE(of, max98926_of_match); +#endif static struct i2c_driver max98926_i2c_driver = { .driver = { .name = "max98926", .of_match_table = of_match_ptr(max98926_of_match), - .pm = NULL, }, .probe = max98926_i2c_probe, .id_table = max98926_i2c_id, |