diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2014-05-24 00:45:58 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-05-24 00:46:05 +0200 |
| commit | 34b16f74ebfb586d97e90bdb72f369aa5d8f16a1 (patch) | |
| tree | c5c8e78ff361ab50bf98f8c0fa35c57d8506ffae /drivers/Makefile | |
| parent | Merge tag 'samsung-drivers' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers (diff) | |
| parent | soc: qcom: Add GSBI driver (diff) | |
| download | linux-dev-34b16f74ebfb586d97e90bdb72f369aa5d8f16a1.tar.xz linux-dev-34b16f74ebfb586d97e90bdb72f369aa5d8f16a1.zip | |
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/ # really early. obj-$(CONFIG_DMADEVICES) += dma/ +# SOC specific infrastructure drivers. +obj-y += soc/ + obj-$(CONFIG_VIRTIO) += virtio/ obj-$(CONFIG_XEN) += xen/ |