Add wmacpi and remove wmbattery