From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 26 Aug 2013 23:40:40 +0000 (+0200)
Subject: Merge branch 'acpi-video'
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8a3a53ea89251314338b03dad1ae2b5cc340350f;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'acpi-video'

* acpi-video:
  ACPI: blacklist win8 OSI for buggy laptops
  ACPI: blacklist win8 OSI for ASUS Zenbook Prime UX31A
  ACPI / video: drop unused fields from struct acpi_video_brightness_flags
  ACPI / video: remove unnecessary type casting
  ACPI / video: trivial style cleanups
  ACPI / video: trivial costmetic cleanups

Conflicts:
	drivers/acpi/video.c
---

8a3a53ea89251314338b03dad1ae2b5cc340350f
diff --cc drivers/acpi/video.c
index c86fc0c70ff6,159c935eaac5..aebcf6355df4
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@@ -900,12 -904,9 +891,12 @@@ static void acpi_video_device_find_cap(
  		acpi_handle acpi_parent;
  		struct device *parent = NULL;
  		int result;
- 		static int count = 0;
+ 		static int count;
  		char *name;
  
 +		result = acpi_video_init_brightness(device);
 +		if (result)
 +			return;
  		name = kasprintf(GFP_KERNEL, "acpi_video%d", count);
  		if (!name)
  			return;