Revert "Fix compilation after porting older battery/charger code"

This reverts commit 9c6d78396ee6d8d7de657d37dd65a1460e03eef2.
Revert "Port older battery/charger codes from 2.6.32"

This reverts commit 6bba776eef0c042c1ae6cd839333d11e89e8655f.