From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 29 May 2014 23:55:36 +0000 (+1000)
Subject: Merge remote-tracking branch 'mips/mips-for-linux-next'
X-Git-Tag: next-20140530~108
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7ad88f0d1a136c3c869ad5ca9ab4d56fd8b1638f;p=karo-tx-linux.git

Merge remote-tracking branch 'mips/mips-for-linux-next'
---

7ad88f0d1a136c3c869ad5ca9ab4d56fd8b1638f
diff --cc drivers/cpuidle/Makefile
index cd3ab59f8461,a7fc96bcf319..5404d5d1e66a
--- a/drivers/cpuidle/Makefile
+++ b/drivers/cpuidle/Makefile
@@@ -14,8 -13,11 +14,12 @@@ obj-$(CONFIG_ARM_KIRKWOOD_CPUIDLE)	+= c
  obj-$(CONFIG_ARM_ZYNQ_CPUIDLE)		+= cpuidle-zynq.o
  obj-$(CONFIG_ARM_U8500_CPUIDLE)         += cpuidle-ux500.o
  obj-$(CONFIG_ARM_AT91_CPUIDLE)          += cpuidle-at91.o
 +obj-$(CONFIG_ARM_EXYNOS_CPUIDLE)        += cpuidle-exynos.o
  
+ ###############################################################################
+ # MIPS drivers
+ obj-$(CONFIG_MIPS_CPS_CPUIDLE)		+= cpuidle-cps.o
+ 
  ###############################################################################
  # POWERPC drivers
  obj-$(CONFIG_PSERIES_CPUIDLE)		+= cpuidle-pseries.o