Merge branch 'bugzilla-11715' into test

[linux-2.6-omap-h63xx.git] / drivers / Makefile

diff --git a/drivers/Makefile b/drivers/Makefile
index 2735bde73475c5f840c2d52266fd47e54b730bcd..a0a2e3b675d6e1a1b1df241bfb5980b9b2d570b2 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -82,6 +82,7 @@ obj-$(CONFIG_EISA)            += eisa/
 obj-y                          += lguest/
 obj-$(CONFIG_CPU_FREQ)         += cpufreq/
 obj-$(CONFIG_CPU_IDLE)         += cpuidle/
+obj-y                          += idle/
 obj-$(CONFIG_MMC)              += mmc/
 obj-$(CONFIG_MEMSTICK)         += memstick/
 obj-$(CONFIG_NEW_LEDS)         += leds/
@@ -99,3 +100,4 @@ obj-$(CONFIG_OF)             += of/
 obj-$(CONFIG_SSB)              += ssb/
 obj-$(CONFIG_VIRTIO)           += virtio/
 obj-$(CONFIG_REGULATOR)                += regulator/
+obj-$(CONFIG_STAGING)          += staging/