[GIT PULL] regmap merge window fix

[Mark Brown]

The following changes since commit 5771a8c08880cdca3bfb4a3fc6d309d6bba20877:

  Linux v4.13-rc1 (2017-07-15 15:22:10 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git tags/regmap-fix-w1-merge-window

for you to fetch changes up to 5b20a436835a3e4d0a8118594a864bc88ea53f93:

  regmap: regmap-w1: Fix build troubles (2017-07-17 15:53:00 +0100)

----------------------------------------------------------------
regmap: 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.

----------------------------------------------------------------
minimumlaw@xxxxxxxxxx (1):
      regmap: regmap-w1: Fix build troubles

 drivers/base/regmap/regmap-w1.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Attachment: signature.asc
Description: PGP signature