diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-05-23 18:45:58 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-05-23 18:46:05 -0400 |
| commit | 34b16f74ebfb586d97e90bdb72f369aa5d8f16a1 (patch) | |
| tree | c5c8e78ff361ab50bf98f8c0fa35c57d8506ffae /drivers/Makefile | |
| parent | efca0a3e85045da839320d7c5121f82d55be8b79 (diff) | |
| parent | 5d144e36b7c51612922fa05d37ff3a869261cc82 (diff) | |
Merge tag 'qcom-drivers-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom into next/drivers
Qualcomm ARM Based driver Updates for v3.16
* Introduce drivers/soc directory for misc SoC specific code
* Add driver to configure GSBI device
* tag 'qcom-drivers-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom:
soc: qcom: Add GSBI driver
soc: Introduce drivers/soc place-holder for SOC specific drivers
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/Makefile')
| -rw-r--r-- | drivers/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index d05d81b19b50..e0c64454b96d 100644 --- a/drivers/Makefile +++ b/drivers/Makefile | |||
| @@ -33,6 +33,9 @@ obj-y += amba/ | |||
| 33 | # really early. | 33 | # really early. |
| 34 | obj-$(CONFIG_DMADEVICES) += dma/ | 34 | obj-$(CONFIG_DMADEVICES) += dma/ |
| 35 | 35 | ||
| 36 | # SOC specific infrastructure drivers. | ||
| 37 | obj-y += soc/ | ||
| 38 | |||
| 36 | obj-$(CONFIG_VIRTIO) += virtio/ | 39 | obj-$(CONFIG_VIRTIO) += virtio/ |
| 37 | obj-$(CONFIG_XEN) += xen/ | 40 | obj-$(CONFIG_XEN) += xen/ |
| 38 | 41 | ||