diff options
| author | Len Brown <len.brown@intel.com> | 2009-01-09 04:01:26 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-01-09 04:56:56 -0500 |
| commit | d97c0defba25a959a990f6d4759f43075540832e (patch) | |
| tree | 27dceaf310e01a6bbcceee3550112b19202f142f /drivers/Makefile | |
| parent | ec9f168fcc344d2ffec1c8c822076bf22dab5c33 (diff) | |
| parent | b4f9fe12157a33351d0df78e925dcacd13252783 (diff) | |
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/Makefile | 1 |
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/ | |||
| 105 | obj-$(CONFIG_SSB) += ssb/ | 105 | obj-$(CONFIG_SSB) += ssb/ |
| 106 | obj-$(CONFIG_VIRTIO) += virtio/ | 106 | obj-$(CONFIG_VIRTIO) += virtio/ |
| 107 | obj-$(CONFIG_STAGING) += staging/ | 107 | obj-$(CONFIG_STAGING) += staging/ |
| 108 | obj-y += platform/ | ||