Revert "Just the usual setup"

This reverts commit 583f248d9b9f1e20996d98cc1746f3ad825d0f76.

Conflicts:
	arch/arm/configs/franco_defconfig
	drivers/misc/gamma_control.c