* [PATCH 5/5] Revert "power_supply: remove capacity_level from list of sysfs attributes"
@ 2009-06-23 3:46 Andres Salomon
2009-06-24 14:30 ` Anton Vorontsov
0 siblings, 1 reply; 2+ messages in thread
From: Andres Salomon @ 2009-06-23 3:46 UTC (permalink / raw)
To: cbou; +Cc: dwmw2, linux-kernel, richard, Andrew Morton, Paul Fox, dsaxena
This reverts commit 4cbc76eadf56399cd11fb736b33c53aec9caab8c.
This is part of the CAPACITY_LEVEL re-add.
Signed-off-by: Andres Salomon <dilinger@collabora.co.uk>
---
drivers/power/power_supply_sysfs.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
index fef37b2..d22d9c9 100644
--- a/drivers/power/power_supply_sysfs.c
+++ b/drivers/power/power_supply_sysfs.c
@@ -116,6 +116,7 @@ static struct device_attribute power_supply_attrs[] = {
POWER_SUPPLY_ATTR(energy_now),
POWER_SUPPLY_ATTR(energy_avg),
POWER_SUPPLY_ATTR(capacity),
+ POWER_SUPPLY_ATTR(capacity_level),
POWER_SUPPLY_ATTR(temp),
POWER_SUPPLY_ATTR(temp_ambient),
POWER_SUPPLY_ATTR(time_to_empty_now),
--
1.5.6.5
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH 5/5] Revert "power_supply: remove capacity_level from list of sysfs attributes"
2009-06-23 3:46 [PATCH 5/5] Revert "power_supply: remove capacity_level from list of sysfs attributes" Andres Salomon
@ 2009-06-24 14:30 ` Anton Vorontsov
0 siblings, 0 replies; 2+ messages in thread
From: Anton Vorontsov @ 2009-06-24 14:30 UTC (permalink / raw)
To: Andres Salomon
Cc: cbou, dwmw2, linux-kernel, richard, Andrew Morton, Paul Fox,
dsaxena
On Mon, Jun 22, 2009 at 11:46:26PM -0400, Andres Salomon wrote:
>
> This reverts commit 4cbc76eadf56399cd11fb736b33c53aec9caab8c.
>
> This is part of the CAPACITY_LEVEL re-add.
The two patches (4/5 and 5/5) looks OK, but could you merge them
together? Title them "Re-add capacity_level ...".
And place them somewhere in the beginning of this series, i.e.
before 2/5 and 3/5. That way we can apply 1/5, 4/5, and 5/5,
without depending on 2/5 and 3/5.
Thanks,
> Signed-off-by: Andres Salomon <dilinger@collabora.co.uk>
> ---
> drivers/power/power_supply_sysfs.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
> index fef37b2..d22d9c9 100644
> --- a/drivers/power/power_supply_sysfs.c
> +++ b/drivers/power/power_supply_sysfs.c
> @@ -116,6 +116,7 @@ static struct device_attribute power_supply_attrs[] = {
> POWER_SUPPLY_ATTR(energy_now),
> POWER_SUPPLY_ATTR(energy_avg),
> POWER_SUPPLY_ATTR(capacity),
> + POWER_SUPPLY_ATTR(capacity_level),
> POWER_SUPPLY_ATTR(temp),
> POWER_SUPPLY_ATTR(temp_ambient),
> POWER_SUPPLY_ATTR(time_to_empty_now),
> --
> 1.5.6.5
>
--
Anton Vorontsov
email: cbouatmailru@gmail.com
irc://irc.freenode.net/bd2
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-06-24 14:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-06-23 3:46 [PATCH 5/5] Revert "power_supply: remove capacity_level from list of sysfs attributes" Andres Salomon
2009-06-24 14:30 ` Anton Vorontsov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox