This reverts commit 55ca1d277a7b7a99ed02e8e14b5e36f0c5e9e86d. Conflicts: arch/arm/configs/htcleo_defconfig arch/arm/mach-msm/board-htcleo.c arch/arm/mach-msm/htc_battery.c include/linux/ds2746_battery.h
This reverts commit 55ca1d277a7b7a99ed02e8e14b5e36f0c5e9e86d. Conflicts: arch/arm/configs/htcleo_defconfig arch/arm/mach-msm/board-htcleo.c arch/arm/mach-msm/htc_battery.c include/linux/ds2746_battery.h