diff options
| author | Linus Torvalds | 2017-07-07 13:38:26 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2017-07-07 13:38:26 -0700 |
| commit | df7cb187edc726fe78f2c9818fb8eb534a61541c (patch) | |
| tree | 53ff8df8d74ac01eb8f916962b004eb6f703d4a6 /arch | |
| parent | 6972b007ca771e33dec992ccd104c95a97a186e5 (diff) | |
| parent | 056d6ff470a8e782648fd020940c04d0d4a0d761 (diff) | |
Merge tag 'backlight-next-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight
Pull backlight updates from Lee Jones:
"Core Framework:
- Report correct error status to user
Fix-ups:
- Move Backlight headers out of I2C (adp8860, adp8870)"
* tag 'backlight-next-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
video: adp8870: move header file out of I2C realm
backlight: adp8860: Move header file out of I2C realm
backlight: Report error on failure
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/blackfin/mach-bf537/boards/stamp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c index 24985e658c19..7528148dc492 100644 --- a/arch/blackfin/mach-bf537/boards/stamp.c +++ b/arch/blackfin/mach-bf537/boards/stamp.c @@ -1995,7 +1995,7 @@ static struct adp5588_gpio_platform_data adp5588_gpio_data = { #endif #if IS_ENABLED(CONFIG_BACKLIGHT_ADP8870) -#include <linux/i2c/adp8870.h> +#include <linux/platform_data/adp8870.h> static struct led_info adp8870_leds[] = { { .name = "adp8870-led7", @@ -2047,7 +2047,7 @@ static struct adp8870_backlight_platform_data adp8870_pdata = { #endif #if IS_ENABLED(CONFIG_BACKLIGHT_ADP8860) -#include <linux/i2c/adp8860.h> +#include <linux/platform_data/adp8860.h> static struct led_info adp8860_leds[] = { { .name = "adp8860-led7", |