diff options
| author | Thierry Reding <thierry.reding@gmail.com> | 2014-04-01 14:00:52 +0200 |
|---|---|---|
| committer | Thierry Reding <thierry.reding@gmail.com> | 2014-04-01 14:01:32 +0200 |
| commit | f409cd38334ce4d2b1b99fef00543de1695a281f (patch) | |
| tree | 8c3dc40920b048a85abda19a2152c6585919154f /drivers/pwm | |
| parent | d16a5aa9e821633a3095d7a88cd1d2cd108bf966 (diff) | |
| download | linux-f409cd38334ce4d2b1b99fef00543de1695a281f.tar.bz2 | |
Revert "pwm: pxa: Use of_match_ptr()"
This reverts commit 8468949cddcdbb1b1b1bc552aefceb252078ceb1.
The OF match table dummy for non-OF configurations cannot be removed
because it is still used by the pxa_pwm_get_id_dt() function.
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
Diffstat (limited to 'drivers/pwm')
| -rw-r--r-- | drivers/pwm/pwm-pxa.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pwm/pwm-pxa.c b/drivers/pwm/pwm-pxa.c index 7eb2c181c25a..8d995731cef8 100644 --- a/drivers/pwm/pwm-pxa.c +++ b/drivers/pwm/pwm-pxa.c @@ -140,6 +140,8 @@ static struct of_device_id pwm_of_match[] = { { } }; MODULE_DEVICE_TABLE(of, pwm_of_match); +#else +#define pwm_of_match NULL #endif static const struct platform_device_id *pxa_pwm_get_id_dt(struct device *dev) @@ -226,7 +228,7 @@ static struct platform_driver pwm_driver = { .driver = { .name = "pxa25x-pwm", .owner = THIS_MODULE, - .of_match_table = of_match_ptr(pwm_of_match), + .of_match_table = pwm_of_match, }, .probe = pwm_probe, .remove = pwm_remove, |