summaryrefslogtreecommitdiffstats
path: root/drivers/Makefile
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-01-09 04:01:26 -0500
committerLen Brown <len.brown@intel.com>2009-01-09 04:56:56 -0500
commitd97c0defba25a959a990f6d4759f43075540832e (patch)
tree27dceaf310e01a6bbcceee3550112b19202f142f /drivers/Makefile
parentec9f168fcc344d2ffec1c8c822076bf22dab5c33 (diff)
parentb4f9fe12157a33351d0df78e925dcacd13252783 (diff)
downloadlinux-d97c0defba25a959a990f6d4759f43075540832e.tar.gz
linux-d97c0defba25a959a990f6d4759f43075540832e.tar.bz2
linux-d97c0defba25a959a990f6d4759f43075540832e.zip
Merge branch 'drivers-platform' into release
Conflicts: drivers/misc/Kconfig Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/Makefile')
-rw-r--r--drivers/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/Makefile b/drivers/Makefile
index 6326f4dbbdab..c1bf41737936 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -105,3 +105,4 @@ obj-$(CONFIG_OF) += of/
obj-$(CONFIG_SSB) += ssb/
obj-$(CONFIG_VIRTIO) += virtio/
obj-$(CONFIG_STAGING) += staging/
+obj-y += platform/