diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-07 13:38:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-07 13:38:26 -0700 |
| commit | df7cb187edc726fe78f2c9818fb8eb534a61541c (patch) | |
| tree | 53ff8df8d74ac01eb8f916962b004eb6f703d4a6 /include | |
| parent | Merge (most of) tag 'mfd-next-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd (diff) | |
| parent | video: adp8870: move header file out of I2C realm (diff) | |
| download | linux-dev-df7cb187edc726fe78f2c9818fb8eb534a61541c.tar.xz linux-dev-df7cb187edc726fe78f2c9818fb8eb534a61541c.zip | |
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 'include')
| -rw-r--r-- | include/linux/platform_data/adp8860.h (renamed from include/linux/i2c/adp8860.h) | 0 | ||||
| -rw-r--r-- | include/linux/platform_data/adp8870.h (renamed from include/linux/i2c/adp8870.h) | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/include/linux/i2c/adp8860.h b/include/linux/platform_data/adp8860.h index 0b4d39855c91..0b4d39855c91 100644 --- a/include/linux/i2c/adp8860.h +++ b/include/linux/platform_data/adp8860.h diff --git a/include/linux/i2c/adp8870.h b/include/linux/platform_data/adp8870.h index 624dceccbd5b..624dceccbd5b 100644 --- a/include/linux/i2c/adp8870.h +++ b/include/linux/platform_data/adp8870.h |