diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-06-29 17:34:57 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-06-29 17:34:57 +0200 |
| commit | ffe3744a591fdce695da6b891378261e2caedc69 (patch) | |
| tree | 2581d8ed91b8db8cb3022a1b2dcd5f2e441b443c /drivers/soc/Makefile | |
| parent | 4312fc34f6d000de0cc233dd442bc573d015b8a2 (diff) | |
| parent | d97d0f1b4630d46976b7a275c1636229c3ebf4d0 (diff) | |
| download | op-kernel-dev-ffe3744a591fdce695da6b891378261e2caedc69.zip op-kernel-dev-ffe3744a591fdce695da6b891378261e2caedc69.tar.gz | |
Merge tag 'actions-drivers-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-actions into next/drivers
Pull "Actions Semi SoC drivers for 4.13" from Andreas Färber:
This adds clock source and power domain drivers for S500/S900.
* tag 'actions-drivers-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-actions:
soc: actions: owl-sps: Factor out owl_sps_set_pg() for power-gating
soc: actions: Add Owl SPS
dt-bindings: power: Add Owl SPS power domains
clocksource: owl: Add S900 support
clocksource: Add Owl timer
Diffstat (limited to 'drivers/soc/Makefile')
| -rw-r--r-- | drivers/soc/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile index c0b2a61..9241125 100644 --- a/drivers/soc/Makefile +++ b/drivers/soc/Makefile @@ -2,6 +2,7 @@ # Makefile for the Linux Kernel SOC specific device drivers. # +obj-$(CONFIG_ARCH_ACTIONS) += actions/ obj-$(CONFIG_ARCH_AT91) += atmel/ obj-y += bcm/ obj-$(CONFIG_ARCH_DOVE) += dove/ |
