regulator: core: Remove duplicate copy of active-discharge parsing
authorVladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
Thu, 24 Mar 2016 19:52:01 +0000 (21:52 +0200)
committerMark Brown <broonie@kernel.org>
Fri, 25 Mar 2016 11:12:33 +0000 (11:12 +0000)
commite437b90026ac754a0f8b4fe44b844d12ce6162d1
tree2d8887cdfce0b9b889f7cf485d9d3af062d0a144
parent768e66686cfe83f786f6ae26f1799cca69e80523
regulator: core: Remove duplicate copy of active-discharge parsing

Apparently due to a wrongly resolved merge conflict between two
branches, which contained the same commit, the commit contents
partially was added two times in a row.

This change reverts the latter wrong inclusion of commit 909f7ee0b5f3
("regulator: core: Add support for active-discharge configuration").

The first applied commit 670666b9e0af ("regulator: core: Add support
for active-discharge configuration") is not touched.

Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
Cc: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/regulator/core.c