diff options
| author | Mark Brown <broonie@kernel.org> | 2017-08-30 23:15:31 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-08-30 23:15:31 +0200 |
| commit | b388dc1f62a9bdd9c4758a0664e61d0f9a9da519 (patch) | |
| tree | 696fd3c245700ee59ebcf3a65b90f8773b904624 /drivers/base/regmap/regmap-w1.c | |
| parent | ASoC: remove duplicate definition of dapm_routes/num_dapm_routes (diff) | |
| parent | Linux 4.13-rc7 (diff) | |
| download | linux-b388dc1f62a9bdd9c4758a0664e61d0f9a9da519.tar.xz linux-b388dc1f62a9bdd9c4758a0664e61d0f9a9da519.zip | |
Merge tag 'v4.13-rc7' into asoc-component
Linux 4.13-rc7
Diffstat (limited to 'drivers/base/regmap/regmap-w1.c')
| -rw-r--r-- | drivers/base/regmap/regmap-w1.c | 4 |
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" |