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: Remove bogus SYSFS dependency backlight: simplify corgi_bl locking backlight: Separate backlight properties from backlight ops pointers backlight: Clean up pmac_backlight handling backlight: Improve backlight selection for fbdev drivers backlight: Rework backlight/fb interaction simplifying, lots backlight: Remove unneeded backlight update_status calls backlight: Remove uneeded update_status call from chipsfb.c backlight/fbcon: Add FB_EVENT_CONBLANK backlight: Fix Kconfig entries backlight: Remove uneeded nvidia set_power calls backlight: Convert semaphore -> mutex backlight: Fix external uses of backlight internal semaphore backlight: Minor code cleanups for hp680_bl.c backlight: Minor code cleanups for corgi_bl.c backlight: Remove excessive (un)likelys backlight: Remove unneeded owner field backlight: Fix error handling backlight: Add Frontpath ProGear HX1050+ driver backlight: Add maintainer entry
2026-09-26 18:16:26 +00:00 · 2007-02-20 10:17:32 -08:00 · 2007-02-20 10:17:32 -08:00 · a5527c6a58
commit a5527c6a58
parent 4afffe5eab 8f27489d11
36 changed files with 629 additions and 766 deletions
--- a/5
+++ b/5
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
--- a/arch/powerpc/platforms/powermac/backlight.c
+++ b/arch/powerpc/platforms/powermac/backlight.c
--- a/drivers/acpi/asus_acpi.c
+++ b/drivers/acpi/asus_acpi.c
--- a/drivers/acpi/ibm_acpi.c
+++ b/drivers/acpi/ibm_acpi.c
--- a/drivers/acpi/toshiba_acpi.c
+++ b/drivers/acpi/toshiba_acpi.c
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
--- a/drivers/macintosh/via-pmu-backlight.c
+++ b/drivers/macintosh/via-pmu-backlight.c
--- a/drivers/misc/asus-laptop.c
+++ b/drivers/misc/asus-laptop.c
--- a/drivers/misc/msi-laptop.c
+++ b/drivers/misc/msi-laptop.c
--- a/drivers/misc/sony-laptop.c
+++ b/drivers/misc/sony-laptop.c
--- a/drivers/usb/misc/appledisplay.c
+++ b/drivers/usb/misc/appledisplay.c
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
--- a/drivers/video/aty/radeon_backlight.c
+++ b/drivers/video/aty/radeon_backlight.c
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
--- a/drivers/video/backlight/Makefile
+++ b/drivers/video/backlight/Makefile
--- a/drivers/video/backlight/backlight.c
+++ b/drivers/video/backlight/backlight.c
--- a/drivers/video/backlight/corgi_bl.c
+++ b/drivers/video/backlight/corgi_bl.c
--- a/drivers/video/backlight/hp680_bl.c
+++ b/drivers/video/backlight/hp680_bl.c
--- a/drivers/video/backlight/lcd.c
+++ b/drivers/video/backlight/lcd.c
--- a/drivers/video/backlight/locomolcd.c
+++ b/drivers/video/backlight/locomolcd.c
--- a/drivers/video/backlight/progear_bl.c
+++ b/drivers/video/backlight/progear_bl.c
--- a/drivers/video/chipsfb.c
+++ b/drivers/video/chipsfb.c
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
--- a/drivers/video/fbsysfs.c
+++ b/drivers/video/fbsysfs.c
--- a/drivers/video/nvidia/nv_backlight.c
+++ b/drivers/video/nvidia/nv_backlight.c
--- a/drivers/video/nvidia/nv_proto.h
+++ b/drivers/video/nvidia/nv_proto.h
--- a/drivers/video/nvidia/nvidia.c
+++ b/drivers/video/nvidia/nvidia.c
--- a/drivers/video/riva/fbdev.c
+++ b/drivers/video/riva/fbdev.c
--- a/include/linux/backlight.h
+++ b/include/linux/backlight.h
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
--- a/include/linux/lcd.h
+++ b/include/linux/lcd.h