Revert "more fixes"

This reverts commit e057c77dff28f8f6b8dcd6addd4aaa5fc8371405.

Conflicts:
	drivers/media/video/msm/mt9p012_fox.c