diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-06 15:01:52 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-06 15:01:52 +0100 |
| commit | c39b7eef7d92f5ffef1abf04227a62fa2a6a62b2 (patch) | |
| tree | 00aff822e9208ab2f2ac41c6e1a0f61c6eb9b57f /drivers/hwmon/pwm-fan.c | |
| parent | 1e1851f9d725ff9f00d74dfc4b73d47cba57466f (diff) | |
| parent | 049e6dde7e57f0054fdc49102e7ef4830c698b46 (diff) | |
| download | linux-c39b7eef7d92f5ffef1abf04227a62fa2a6a62b2.tar.gz linux-c39b7eef7d92f5ffef1abf04227a62fa2a6a62b2.tar.bz2 linux-c39b7eef7d92f5ffef1abf04227a62fa2a6a62b2.zip | |
Merge 4.3-rc4 into char-misc-next
This is needed due to the duplicated iommu stuff to help with the merge
and to prevent future issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hwmon/pwm-fan.c')
| -rw-r--r-- | drivers/hwmon/pwm-fan.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hwmon/pwm-fan.c b/drivers/hwmon/pwm-fan.c index 2d9a712699ff..3e23003f78b0 100644 --- a/drivers/hwmon/pwm-fan.c +++ b/drivers/hwmon/pwm-fan.c @@ -323,6 +323,7 @@ static const struct of_device_id of_pwm_fan_match[] = { { .compatible = "pwm-fan", }, {}, }; +MODULE_DEVICE_TABLE(of, of_pwm_fan_match); static struct platform_driver pwm_fan_driver = { .probe = pwm_fan_probe, |