Merge tag 'regmap-fix-w1-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap

torvalds · torvalds · commit 338a57d5cb03 · 2017-07-17T12:38:18.000-07:00
Pull regmap fix from Mark Brown:
 "Fix build due to w1 header refactoring

  The regmap support for w1 was added shortly before a reorganization of
  the w1 headers. While this was noticed before the merge window and
  efforts made to get it resolved in what was sent that managed to fall
  through the cracks, this cleans up and updates things so we look for
  the header in the new location.

  It didn't cause build failures as the driver that's going to be the
  first user got held up with other review issues"

* tag 'regmap-fix-w1-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap: regmap-w1: Fix build troubles
diff --git a/drivers/base/regmap/regmap-w1.c b/drivers/base/regmap/regmap-w1.c
@@ -1,7 +1,7 @@
 /*
  * Register map access API - W1 (1-Wire) support
  *
- * Copyright (C) 2017 OAO Radioavionica
+ * Copyright (c) 2017 Radioavionica Corporation
  * Author: Alex A. Mihaylov <minimumlaw@rambler.ru>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -11,7 +11,7 @@
 
 #include <linux/regmap.h>
 #include <linux/module.h>
-#include "../../w1/w1.h"
+#include <linux/w1.h>
 
 #include "internal.h"
 

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/*`
`2`	`2`	`* Register map access API - W1 (1-Wire) support`
`3`	`3`	`*`
`4`		`- * Copyright (C) 2017 OAO Radioavionica`
	`4`	`+ * Copyright (c) 2017 Radioavionica Corporation`
`5`	`5`	`* Author: Alex A. Mihaylov <minimumlaw@rambler.ru>`
`6`	`6`	`*`
`7`	`7`	`* This program is free software; you can redistribute it and/or modify`
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`#include <linux/regmap.h>`
`13`	`13`	`#include <linux/module.h>`
`14`		`-#include "../../w1/w1.h"`
	`14`	`+#include <linux/w1.h>`
`15`	`15`
`16`	`16`	`#include "internal.h"`
`17`	`17`