From: Andrew Morton <akpm@linux-foundation.org>

greg's tree breaks this.

drivers/power/power_supply_sysfs.c: In function 'power_supply_uevent':          drivers/power/power_supply_sysfs.c:286: error: 'envp' undeclared (first use in this function)                                                                   drivers/power/power_supply_sysfs.c:286: error: (Each undeclared identifier is reported only once                                                                drivers/power/power_supply_sysfs.c:286: error: for each function it appears in.)
drivers/power/power_supply_sysfs.c:286: error: 'i' undeclared (first use in this

Cc: Artem Bityutskiy <dedekind@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/power/power_supply_sysfs.c |    1 -
 1 file changed, 1 deletion(-)

diff -puN drivers/power/power_supply_sysfs.c~revert-git-battery drivers/power/power_supply_sysfs.c
--- a/drivers/power/power_supply_sysfs.c~revert-git-battery
+++ a/drivers/power/power_supply_sysfs.c
@@ -283,7 +283,6 @@ int power_supply_uevent(struct device *d
 		if (ret)
 			goto out;
 	}
-	envp[i] = NULL;
 
 out:
 	free_page((unsigned long)prop_buf);
_