Merge branch 'rmobile/bonito' into rmobile-latest

diff --combined arch/arm/mach-shmobile/Makefile
index 83e35f254bff15a98d28640f115c65b82a424929,abdae89cacf762d222ce3d1bed850a2b6d40b18c..957e5c7a38fe366c3ab486efea6098a8927d9535
--- 1/arch/arm/mach-shmobile/Makefile
--- 2/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@@ -3,7 -3,7 +3,7 @@@
  #
  
  # Common objects
 -obj-y                         := timer.o console.o clock.o pm_runtime.o
 +obj-y                         := timer.o console.o clock.o
  
  # CPU objects
  obj-$(CONFIG_ARCH_SH7367)     += setup-sh7367.o clock-sh7367.o intc-sh7367.o
@@@ -30,6 -30,7 +30,6 @@@ pfc-$(CONFIG_ARCH_R8A7740)    += pfc-r8a77
  obj-$(CONFIG_ARCH_SH7367)     += entry-intc.o
  obj-$(CONFIG_ARCH_SH7377)     += entry-intc.o
  obj-$(CONFIG_ARCH_SH7372)     += entry-intc.o
 -obj-$(CONFIG_ARCH_SH73A0)     += entry-gic.o
  obj-$(CONFIG_ARCH_R8A7740)    += entry-intc.o
  
  # PM objects
@@@ -44,6 -45,7 +44,7 @@@ obj-$(CONFIG_MACH_AP4EVB)     += board-ap4e
  obj-$(CONFIG_MACH_AG5EVM)     += board-ag5evm.o
  obj-$(CONFIG_MACH_MACKEREL)   += board-mackerel.o
  obj-$(CONFIG_MACH_KOTA2)      += board-kota2.o
+ obj-$(CONFIG_MACH_BONITO)     += board-bonito.o
  
  # Framework support
  obj-$(CONFIG_SMP)             += $(smp-y)