DeskDock mode fix for FastCharge (thanks to Hasolo)

Conflicts:

	arch/arm/mach-s5pv210/mach-aries.c

Change-Id: Ic4f433a814e54e79728e1961b7aaab5b7156a248
strange compiling fix (machine_is_p1())