diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-20 11:05:40 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-20 11:05:40 -0700 |
commit | 4d230d4d030e34e6eb8911fb669d1b42298eca9e (patch) | |
tree | 99e54c3857a489ccacd2cd06dafe11caa32b8bb8 /drivers/hsi/controllers/Makefile | |
parent | 410b42978a241dc4a269d0d75c75d260e6d016e8 (diff) | |
parent | c2f90a465df75254fb41bf6e7975464929c21e26 (diff) | |
download | op-kernel-dev-4d230d4d030e34e6eb8911fb669d1b42298eca9e.zip op-kernel-dev-4d230d4d030e34e6eb8911fb669d1b42298eca9e.tar.gz |
Merge tag 'hsi-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi
Pull HSI updates from Sebastian Reichel:
- merge omap-ssi and omap-ssi-port modules
- fix omap-ssi module reloading
- add DVFS support to omap-ssi
* tag 'hsi-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
HSI: omap-ssi: move omap_ssi_port_update_fclk
HSI: omap-ssi: include pinctrl header files
HSI: omap-ssi: add COMMON_CLK dependency
HSI: omap-ssi: add clk change support
HSI: omap_ssi: built omap_ssi and omap_ssi_port into one module
HSI: omap_ssi: fix removal of port platform device
HSI: omap_ssi: make sure probe stays available
HSI: omap_ssi: fix module unloading
HSI: omap_ssi_port: switch to gpiod API
Diffstat (limited to 'drivers/hsi/controllers/Makefile')
-rw-r--r-- | drivers/hsi/controllers/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hsi/controllers/Makefile b/drivers/hsi/controllers/Makefile index d2665cf..7aba9c7 100644 --- a/drivers/hsi/controllers/Makefile +++ b/drivers/hsi/controllers/Makefile @@ -2,5 +2,5 @@ # Makefile for HSI controllers drivers # -obj-$(CONFIG_OMAP_SSI) += omap_ssi.o -obj-$(CONFIG_OMAP_SSI_PORT) += omap_ssi_port.o +omap_ssi-objs += omap_ssi_core.o omap_ssi_port.o +obj-$(CONFIG_OMAP_SSI) += omap_ssi.o |