ARM: omap2plus_defconfig: Update for moved options

Just move the options around to make applying patches against
omap2plus_defconfig easier after making make savedefconfig.

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