diff options
| author | Olof Johansson <olof@lixom.net> | 2015-02-06 00:26:35 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-02-06 00:26:35 -0800 |
| commit | 68a028f856f7ad2482a617ae02518634bae16809 (patch) | |
| tree | 08077391a33698cfb4e60a26a34d7ff9f7798904 /drivers/soc/ti/Makefile | |
| parent | 98d67219da3c23c1e5c27986edcce356b68761f2 (diff) | |
| parent | a68094c67bf1fa86630bd011d2d212899c41e1bc (diff) | |
| download | op-kernel-dev-68a028f856f7ad2482a617ae02518634bae16809.zip op-kernel-dev-68a028f856f7ad2482a617ae02518634bae16809.tar.gz | |
Merge tag 'drivers-soc-ti' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/drivers
Merge "soc: ti: Keystone Navigator SOC driver updates for 3.20" from Santosh
Shilimkar:
Keystone Navigator SOC driver updates for 3.20
- Makefile tweak so that knav_qmss and knav_dma can be made loadable
modules without depedency issues.
- Few more exports to support ARM allmodconfig.
- Marking knav_range_setup_acc_irq() local function as static.
* tag 'drivers-soc-ti' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
soc: ti: knav_qmss_queue: change knav_range_setup_acc_irq to static
soc: ti: knav_qmss_queue: makefile tweak to build as dynamic module
soc: ti: knav_qmss_queue: export API calls for use by user driver
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/soc/ti/Makefile')
| -rw-r--r-- | drivers/soc/ti/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/soc/ti/Makefile b/drivers/soc/ti/Makefile index 6bed611..135bdad 100644 --- a/drivers/soc/ti/Makefile +++ b/drivers/soc/ti/Makefile @@ -1,5 +1,6 @@ # # TI Keystone SOC drivers # -obj-$(CONFIG_KEYSTONE_NAVIGATOR_QMSS) += knav_qmss_queue.o knav_qmss_acc.o +obj-$(CONFIG_KEYSTONE_NAVIGATOR_QMSS) += knav_qmss.o +knav_qmss-y := knav_qmss_queue.o knav_qmss_acc.o obj-$(CONFIG_KEYSTONE_NAVIGATOR_DMA) += knav_dma.o |
