Revert "fix merge conflicts"

This reverts commit 2e5eb3fb19ae99597dafdb5fc826640fa87056f0.
Revert "Crypto: import Motorola Crypto driver"

This reverts commit 9dda212a873d7c89a31c3c047ed2a59a71ab29f5.

Conflicts:
	drivers/staging/Kconfig
defconfig: update
defconfig: Enable DM_REQ_CRYPT