diff options
| author | Len Brown | 2009-01-09 10:01:26 +0100 |
|---|---|---|
| committer | Len Brown | 2009-01-09 10:56:56 +0100 |
| commit | d97c0defba25a959a990f6d4759f43075540832e (patch) | |
| tree | 27dceaf310e01a6bbcceee3550112b19202f142f /drivers/Makefile | |
| parent | Merge branch 'simplify_PRT' into release (diff) | |
| parent | ACPI: move wmi, asus_acpi, toshiba_acpi to drivers/platform/x86 (diff) | |
| download | kernel-qcow2-linux-d97c0defba25a959a990f6d4759f43075540832e.tar.gz kernel-qcow2-linux-d97c0defba25a959a990f6d4759f43075540832e.tar.xz kernel-qcow2-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/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/ obj-$(CONFIG_SSB) += ssb/ obj-$(CONFIG_VIRTIO) += virtio/ obj-$(CONFIG_STAGING) += staging/ +obj-y += platform/ |