Merge branch 'omap-boards' into omap-for-linus

diff --combined arch/arm/configs/ams_delta_defconfig
index ecf45fbff956b682cf611de562212b07b37ce3e9,1d0e8926a2f06017d5e6f1b50539475fcb91238c..6d8a0c891f80546efabdd4e7e82457cbcb288003
--- 1/arch/arm/configs/ams_delta_defconfig
--- 2/arch/arm/configs/ams_delta_defconfig
+++ b/arch/arm/configs/ams_delta_defconfig
@@@ -47,6 -47,7 +47,7 @@@ CONFIG_SYSVIPC_SYSCTL=
  # CONFIG_TASKSTATS is not set
  # CONFIG_UTS_NS is not set
  # CONFIG_AUDIT is not set
+ CONFIG_TREE_PREEMPT_RCU=y
  # CONFIG_IKCONFIG is not set
  CONFIG_LOG_BUF_SHIFT=14
  CONFIG_SYSFS_DEPRECATED=y
@@@ -95,9 -96,8 +96,8 @@@ CONFIG_KMOD=
  # Block layer
  #
  CONFIG_BLOCK=y
- # CONFIG_LBD is not set
+ # CONFIG_LBDAF is not set
  # CONFIG_BLK_DEV_IO_TRACE is not set
- # CONFIG_LSF is not set
  
  #
  # IO Schedulers
@@@ -699,7 -699,6 +699,7 @@@ CONFIG_SERIO=
  CONFIG_SERIO_SERPORT=y
  CONFIG_SERIO_LIBPS2=y
  # CONFIG_SERIO_RAW is not set
 +CONFIG_SERIO_AMS_DELTA=y
  # CONFIG_GAMEPORT is not set
  
  #
@@@ -836,7 -835,8 +836,8 @@@ CONFIG_DAB=
  #
  # Graphics support
  #
- # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+ CONFIG_BACKLIGHT_LCD_SUPPORT=y
+ CONFIG_LCD_CLASS_DEVICE=y
  
  #
  # Display device support
@@@ -1284,7 -1284,7 +1285,7 @@@ CONFIG_DEBUG_PREEMPT=
  # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
  # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
  # CONFIG_DEBUG_KOBJECT is not set
- CONFIG_DEBUG_BUGVERBOSE=y
+ # CONFIG_DEBUG_BUGVERBOSE is not set
  # CONFIG_DEBUG_INFO is not set
  # CONFIG_DEBUG_VM is not set
  # CONFIG_DEBUG_LIST is not set