aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/w1/slaves/Makefile
diff options
context:
space:
mode:
authorDaniel Mack <daniel@zonque.org>2018-07-06 07:35:51 +0200
committerSebastian Reichel <sre@kernel.org>2018-07-11 18:09:09 +0200
commitbf49735537374c02fd4111bd5463e372f69c41f8 (patch)
tree380a984714c0cca718040a2e26d128fe5b2b6108 /drivers/w1/slaves/Makefile
parentw1: core: match sub-nodes of bus masters in devicetree (diff)
downloadlinux-dev-bf49735537374c02fd4111bd5463e372f69c41f8.tar.xz
linux-dev-bf49735537374c02fd4111bd5463e372f69c41f8.zip
power: supply: ds2760_battery: merge ds2760 supply driver with its w1 slave companion
This patch removes the w1 slave driver that used to register the w1 family and instanciate a platform device at runtime. The code now lives in the supply driver instead to avoid that level of indirection. The old device name "ds2760-battery.0" is preserved, so userspace applications can access the same virtual device nodes as before. Note that because the w1 core does not currently have a framework for suspend/resume, the driver now registers a PM notifier callback. Signed-off-by: Daniel Mack <daniel@zonque.org> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Diffstat (limited to 'drivers/w1/slaves/Makefile')
-rw-r--r--drivers/w1/slaves/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/w1/slaves/Makefile b/drivers/w1/slaves/Makefile
index d5f4f4d5b9e5..eab29f151413 100644
--- a/drivers/w1/slaves/Makefile
+++ b/drivers/w1/slaves/Makefile
@@ -14,7 +14,6 @@ obj-$(CONFIG_W1_SLAVE_DS2431) += w1_ds2431.o
obj-$(CONFIG_W1_SLAVE_DS2805) += w1_ds2805.o
obj-$(CONFIG_W1_SLAVE_DS2433) += w1_ds2433.o
obj-$(CONFIG_W1_SLAVE_DS2438) += w1_ds2438.o
-obj-$(CONFIG_W1_SLAVE_DS2760) += w1_ds2760.o
obj-$(CONFIG_W1_SLAVE_DS2780) += w1_ds2780.o
obj-$(CONFIG_W1_SLAVE_DS2781) += w1_ds2781.o
obj-$(CONFIG_W1_SLAVE_DS28E04) += w1_ds28e04.o