From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 6 Jan 2016 19:58:13 +0000 (+0100)
Subject: Merge branch 'for-linus' into for-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9d9938854efcf2f21381b930bc1324e95640e0c4;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'for-linus' into for-next

 Conflicts:
	drivers/gpu/drm/i915/intel_display.c
	sound/soc/intel/skylake/skl.h
---

9d9938854efcf2f21381b930bc1324e95640e0c4
diff --cc sound/soc/intel/skylake/skl.c
index c38bf99ced10,caa69c4598a6..b69649aa7809
--- a/sound/soc/intel/skylake/skl.c
+++ b/sound/soc/intel/skylake/skl.c
@@@ -25,8 -25,8 +25,9 @@@
  #include <linux/pci.h>
  #include <linux/pm_runtime.h>
  #include <linux/platform_device.h>
+ #include <linux/firmware.h>
  #include <sound/pcm.h>
 +#include "../common/sst-acpi.h"
  #include "skl.h"
  
  /*
diff --cc sound/soc/intel/skylake/skl.h
index 3d167eed0f59,a0709e344d44..deec048f00c7
--- a/sound/soc/intel/skylake/skl.h
+++ b/sound/soc/intel/skylake/skl.h
@@@ -68,10 -67,9 +68,11 @@@ struct skl 
  
  	struct skl_dsp_resource resource;
  	struct list_head ppl_list;
 -	struct list_head dapm_path_list;
  
 +	const char *fw_name;
+ 	const struct firmware *tplg;
 +
 +	int supend_active;
  };
  
  #define skl_to_ebus(s)	(&(s)->ebus)