aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex A. Mihaylov <minimumlaw@rambler.ru>2017-07-07 11:38:22 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-07-17 10:45:16 -0400
commitcc84b824e489ef001597ea0ba0ddcec17fb1f05d (patch)
tree8eac7ff5647ea67b659f14660cd8496b9105a55b
parent2c927c0c73fd9f6de9ff576e08cd59f13b9d0ef7 (diff)
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 @@
1/* 1/*
2 * Register map access API - W1 (1-Wire) support 2 * Register map access API - W1 (1-Wire) support
3 * 3 *
4 * Copyright (C) 2017 OAO Radioavionica 4 * Copyright (c) 2017 Radioavionica Corporation
5 * Author: Alex A. Mihaylov <minimumlaw@rambler.ru> 5 * Author: Alex A. Mihaylov <minimumlaw@rambler.ru>
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
@@ -11,7 +11,7 @@
11 11
12#include <linux/regmap.h> 12#include <linux/regmap.h>
13#include <linux/module.h> 13#include <linux/module.h>
14#include "../../w1/w1.h" 14#include <linux/w1.h>
15 15
16#include "internal.h" 16#include "internal.h"
17 17