commit3be324a94dupstream. These are the hunks that I dropped when backporting for 3.2.24, which are applicable now that we also have commitf34cd9ca('samsung-laptop: don't handle backlight if handled by acpi/video'). Signed-off-by: Ben Hutchings <ben@decadent.org.uk>