summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex A. Mihaylov <minimumlaw@rambler.ru>2017-07-07 17:38:22 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-07-17 16:45:16 +0200
commitcc84b824e489ef001597ea0ba0ddcec17fb1f05d (patch)
tree8eac7ff5647ea67b659f14660cd8496b9105a55b
parentw1: Fix slave count on 1-Wire bus (resend) (diff)
downloadlinux-cc84b824e489ef001597ea0ba0ddcec17fb1f05d.tar.xz
linux-cc84b824e489ef001597ea0ba0ddcec17fb1f05d.zip
regmap: regmap-w1: Fix build troubles
Fixes: cc5d0db390b0 ("regmap: Add 1-Wire bus support") Commit de0d6dbdbdb2 ("w1: Add subsystem kernel public interface") Fix place off w1.h header file Cosmetic: Fix company name (local to international) Signed-off-by: Alex A. Mihaylov <minimumlaw@rambler.ru> Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk> Cc: Mark Brown <broonie@kernel.org> Acked-by: Evgeniy Polyakov <zbr@ioremap.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/base/regmap/regmap-w1.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/regmap/regmap-w1.c b/drivers/base/regmap/regmap-w1.c
index 5f04e7bf063e..e6c64b0be5b2 100644
--- 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"