diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 15:21:04 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 15:21:04 -0500 |
| commit | 988addf82e4c03739375279de73929580a2d4a6a (patch) | |
| tree | 989ae1cd4e264bbad80c65f04480486246e7b9f3 /drivers/Makefile | |
| parent | 004c1c7096659d352b83047a7593e91d8a30e3c5 (diff) | |
| parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
Merge branch 'origin' into devel-stable
Conflicts:
arch/arm/mach-mx2/devices.c
arch/arm/mach-mx2/devices.h
sound/soc/pxa/pxa-ssp.c
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 e94cb1b79633..34f1e1064dbc 100644 --- a/drivers/Makefile +++ b/drivers/Makefile | |||
| @@ -107,6 +107,7 @@ obj-$(CONFIG_HID) += hid/ | |||
| 107 | obj-$(CONFIG_PPC_PS3) += ps3/ | 107 | obj-$(CONFIG_PPC_PS3) += ps3/ |
| 108 | obj-$(CONFIG_OF) += of/ | 108 | obj-$(CONFIG_OF) += of/ |
| 109 | obj-$(CONFIG_SSB) += ssb/ | 109 | obj-$(CONFIG_SSB) += ssb/ |
| 110 | obj-$(CONFIG_VHOST_NET) += vhost/ | ||
| 110 | obj-$(CONFIG_VIRTIO) += virtio/ | 111 | obj-$(CONFIG_VIRTIO) += virtio/ |
| 111 | obj-$(CONFIG_VLYNQ) += vlynq/ | 112 | obj-$(CONFIG_VLYNQ) += vlynq/ |
| 112 | obj-$(CONFIG_STAGING) += staging/ | 113 | obj-$(CONFIG_STAGING) += staging/ |