2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-25 21:54:06 +08:00
linux-next/drivers/video/backlight
Linus Torvalds d910fc7860 Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight
* 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight:
  backlight: new driver for ADP5520/ADP5501 MFD PMICs
  backlight: extend event support to also support poll()
  backlight/eeepc-laptop: Update the backlight state when we change brightness
  backlight/acpi: Update the backlight state when we change brightness
  backlight: Allow drivers to update the core, and generate events on changes
  backlight: switch to da903x driver to dev_pm_ops
  backlight: Add support for the Avionic Design Xanthos backlight device.
  backlight: spi driver for LMS283GF05 LCD
  backlight: move hp680-bl's probe function to .devinit.text
  backlight: Add support for new Apple machines.
  backlight: mbp_nvidia_bl: add support for MacBookAir 1,1
  backlight: Add WM831x backlight driver

Trivial conflicts due to '#ifdef CONFIG_PM' differences in
drivers/video/backlight/da903x_bl.c
2009-09-26 10:49:42 -07:00
..
adp5520_bl.c backlight: new driver for ADP5520/ADP5501 MFD PMICs 2009-09-26 16:48:08 +01:00
adx_bl.c backlight: Add support for the Avionic Design Xanthos backlight device. 2009-09-07 15:14:44 +01:00
atmel-pwm-bl.c fbdev: LCD backlight driver using Atmel PWM driver 2008-07-24 10:47:41 -07:00
backlight.c backlight: extend event support to also support poll() 2009-09-26 16:48:06 +01:00
corgi_lcd.c spi: prefix modalias with "spi:" 2009-09-23 07:39:43 -07:00
cr_bllcd.c backlight: crbllcd_bl - Use platform_device_register_simple() 2009-01-08 12:37:28 +00:00
da903x_bl.c backlight: switch to da903x driver to dev_pm_ops 2009-09-21 20:59:12 +01:00
generic_bl.c backlight: Rename the corgi backlight driver to generic 2009-01-08 20:52:37 +00:00
hp680_bl.c backlight: move hp680-bl's probe function to .devinit.text 2009-09-07 14:41:39 +01:00
ili9320.c fb: add support for the ILI9320 video display controller 2008-07-24 10:47:40 -07:00
ili9320.h fb: add support for the ILI9320 video display controller 2008-07-24 10:47:40 -07:00
jornada720_bl.c drivers/video/backlight/jornada720_bl.c: fix build 2009-07-29 19:10:35 -07:00
jornada720_lcd.c backlight: Add HP Jornada 700 series LCD driver 2009-04-06 16:06:55 +01:00
kb3886_bl.c backlight: Add driver for Tabletkiosk Sahara TouchIT-213 Tablet PC 2008-10-21 00:19:49 +01:00
Kconfig Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight 2009-09-26 10:49:42 -07:00
lcd.c fbdev: fix info->lock deadlock in fbcon_event_notify() 2009-04-13 15:04:28 -07:00
lms283gf05.c backlight: spi driver for LMS283GF05 LCD 2009-09-07 15:08:06 +01:00
locomolcd.c [ARM] 4250/1: Fix locomo backlight conversion error/compile failure 2007-03-08 13:34:01 +00:00
ltv350qv.c spi: prefix modalias with "spi:" 2009-09-23 07:39:43 -07:00
ltv350qv.h backlight: Add Samsung LTV350QV LCD driver 2007-10-11 22:24:12 +01:00
Makefile backlight: new driver for ADP5520/ADP5501 MFD PMICs 2009-09-26 16:48:08 +01:00
mbp_nvidia_bl.c backlight: Add support for new Apple machines. 2009-09-07 14:34:08 +01:00
omap1_bl.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
platform_lcd.c backlight: ensure platform_lcd on by default 2008-07-30 09:41:44 -07:00
progear_bl.c backlight: progear_bl - Use platform_device_register_simple() 2009-01-08 12:37:28 +00:00
pwm_bl.c backlight: fix pwm_bl.c to notify platform code when suspending 2009-07-03 14:22:41 +08:00
tdo24m.c spi: prefix modalias with "spi:" 2009-09-23 07:39:43 -07:00
tosa_bl.c backlight: add support for Sharp SL-6000 LCD and backlight drivers 2008-10-21 00:19:49 +01:00
tosa_lcd.c spi: prefix modalias with "spi:" 2009-09-23 07:39:43 -07:00
vgg2432a4.c spi: prefix modalias with "spi:" 2009-09-23 07:39:43 -07:00
wm831x_bl.c backlight: Add WM831x backlight driver 2009-09-07 14:05:07 +01:00