summaryrefslogtreecommitdiffstats
path: root/drivers/staging/greybus
diff options
context:
space:
mode:
authorRui Miguel Silva <rui.silva@linaro.org>2015-11-12 15:35:59 +0000
committerGreg Kroah-Hartman <gregkh@google.com>2015-11-12 16:06:49 -0800
commit464888410d3499708baf168bc52e13f18d0cf0ae (patch)
tree7d2d0abdc487f046f788e2f62033a62217d91d20 /drivers/staging/greybus
parent69166d252536b644f82782840cf31e6d685616dc (diff)
greybus: battery: move battery file to power_supply
Rename the battery.c to power_supply.c and update the makefile as the Greybus protocol is being renamed from battery to power_supply. Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'drivers/staging/greybus')
-rw-r--r--drivers/staging/greybus/Makefile4
-rw-r--r--drivers/staging/greybus/power_supply.c (renamed from drivers/staging/greybus/battery.c)0
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/greybus/Makefile b/drivers/staging/greybus/Makefile
index 8b28b4b5a53d..d479a0291ed7 100644
--- a/drivers/staging/greybus/Makefile
+++ b/drivers/staging/greybus/Makefile
@@ -24,7 +24,7 @@ gb-phy-y := gpbridge.o \
# Prefix all modules with gb-
gb-vibrator-y := vibrator.o
-gb-battery-y := battery.o
+gb-power-supply-y := power_supply.o
gb-loopback-y := loopback.o
gb-light-y := light.o
gb-raw-y := raw.o
@@ -36,7 +36,7 @@ gb-db3-y := db3-platform.o
obj-m += greybus.o
obj-m += gb-phy.o
obj-m += gb-vibrator.o
-obj-m += gb-battery.o
+obj-m += gb-power-supply.o
obj-m += gb-loopback.o
obj-m += gb-light.o
obj-m += gb-hid.o
diff --git a/drivers/staging/greybus/battery.c b/drivers/staging/greybus/power_supply.c
index e119775fb19b..e119775fb19b 100644
--- a/drivers/staging/greybus/battery.c
+++ b/drivers/staging/greybus/power_supply.c