ARM: omap2plus_defconfig: Update for moved options

These options have just moved around, let's update with make
savedefconfig to make patching the file easier.

Signed-off-by: Tony Lindgren <tony@atomide.com>