From: Will Deacon <will.deacon@arm.com>
Date: Fri, 3 May 2019 09:18:08 +0000 (+0100)
Subject: Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b33f908811b7627015238e0dee9baf2b4c9d720d;p=linux.git

Merge branch 'for-next/perf' of git://git./linux/kernel/git/will/linux into for-next/core
---

b33f908811b7627015238e0dee9baf2b4c9d720d
diff --cc drivers/acpi/arm64/iort.c
index a46c2c162c03e,2d70b349bd6c9..adbf7cbedf80d
--- a/drivers/acpi/arm64/iort.c
+++ b/drivers/acpi/arm64/iort.c
@@@ -1324,8 -1395,9 +1401,9 @@@ struct iort_dev_config 
  	int (*dev_count_resources)(struct acpi_iort_node *node);
  	void (*dev_init_resources)(struct resource *res,
  				     struct acpi_iort_node *node);
 -	void (*dev_set_proximity)(struct device *dev,
 +	int (*dev_set_proximity)(struct device *dev,
  				    struct acpi_iort_node *node);
+ 	int (*dev_add_platdata)(struct platform_device *pdev);
  };
  
  static const struct iort_dev_config iort_arm_smmu_v3_cfg __initconst = {