Revert "- removed redefinition"

This reverts commit a3896c2bb6a65aa0b11250693c38d4f7651a42e7.
Revert "-added missed ifdef"

This reverts commit def4e68fde0cfae99185c0d829befdfb3b095ab8.
Revert "aries: Add support for the Samsung Galaxy Player/S Wifi 4.0 (YP-G1)"

This reverts commit 045f2b5f7123d3b7b49eb41faed732209325ae18.