diff options
| author | Martin Peres <martin.peres@free.fr> | 2016-12-07 05:30:15 +0100 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2017-01-31 11:05:25 +0100 |
| commit | d72498ca2cbcf15e5038b184a95f061bca21e820 (patch) | |
| tree | 6bfbd74d0148271552508b3c88f5c330000f641d /drivers/gpu | |
| parent | drm/nouveau/disp/mcp7x: disable dptmds workaround (diff) | |
| download | linux-d72498ca2cbcf15e5038b184a95f061bca21e820.tar.xz linux-d72498ca2cbcf15e5038b184a95f061bca21e820.zip | |
drm/nouveau/nouveau/led: prevent compiling the led-code if nouveau=y and leds=m
The proper fix would have been to select LEDS_CLASS but this can lead
to a circular dependency, as found out by Arnd.
This patch implements Arnd's suggestion instead, at the cost of some
auto-magic for a fringe feature.
Reported-by: Arnd Bergmann <arnd@arndb.de>
Reported-by: Intel's 0-DAY
Fixes: 8d021d71b324 ("drm/nouveau/drm/nouveau: add a LED driver for the NVIDIA logo")
Signed-off-by: Martin Peres <martin.peres@free.fr>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_led.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_led.h b/drivers/gpu/drm/nouveau/nouveau_led.h index 187ecdb82002..21a5775028cc 100644 --- a/drivers/gpu/drm/nouveau/nouveau_led.h +++ b/drivers/gpu/drm/nouveau/nouveau_led.h @@ -42,7 +42,7 @@ nouveau_led(struct drm_device *dev) } /* nouveau_led.c */ -#if IS_ENABLED(CONFIG_LEDS_CLASS) +#if IS_REACHABLE(CONFIG_LEDS_CLASS) int nouveau_led_init(struct drm_device *dev); void nouveau_led_suspend(struct drm_device *dev); void nouveau_led_resume(struct drm_device *dev); |