> > > diff -puN drivers/acpi/video_detect.c~acpi-video-fix-acpi_backlight=video drivers/acpi/video_detect.c > > > --- a/drivers/acpi/video_detect.c~acpi-video-fix-acpi_backlight=video > > > +++ a/drivers/acpi/video_detect.c > > > @@ -266,7 +266,7 @@ static int __init acpi_display_output(ch > > > ACPI_VIDEO_OUTPUT_SWITCHING_FORCE_VENDOR; > > > if (!strcmp("video", str)) > > > acpi_video_support |= > > > - ACPI_VIDEO_OUTPUT_SWITCHING_FORCE_VIDEO; > > > + ACPI_VIDEO_BACKLIGHT_FORCE_VIDEO; > > > } > > > return 1; > linux-next changes acpi_backlight(). In my tree patch(1) decided to > migrate the hunk into acpi_display_output(). I think the hunk got mis-relocated in your tree, and that the correct patch is included in the acpi tree. > Please check that acpi_display_output() didn't need the same change. It looks okay. > I'll drop the patch, thanks. thanks, -Len -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html