diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2018-01-21 23:32:02 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-01-21 23:32:02 +1100 |
| commit | 4afa0f3a89ca4b60066a5278c2e13dd29118d672 (patch) | |
| tree | 9b417cf722970e7a669c662c2aade849c7adab62 /arch/powerpc/sysdev/Makefile | |
| parent | ebf0b6a8b1e445d2be66087732aafcda12ab9f59 (diff) | |
| parent | c095ff93f901c1620b28dce4d813dd548bc5236b (diff) | |
| download | talos-obmc-linux-4afa0f3a89ca4b60066a5278c2e13dd29118d672.tar.gz talos-obmc-linux-4afa0f3a89ca4b60066a5278c2e13dd29118d672.zip | |
Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next
Freescale updates from Scott:
"Contains fixes for CPM GPIO and an FSL PCI erratum workaround, plus a
minor cleanup patch."
Diffstat (limited to 'arch/powerpc/sysdev/Makefile')
| -rw-r--r-- | arch/powerpc/sysdev/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile index 0baba21404dc..fc31a271830b 100644 --- a/arch/powerpc/sysdev/Makefile +++ b/arch/powerpc/sysdev/Makefile @@ -43,7 +43,8 @@ obj-$(CONFIG_OF_RTC) += of_rtc.o obj-$(CONFIG_CPM) += cpm_common.o obj-$(CONFIG_CPM1) += cpm1.o -obj-$(CONFIG_CPM2) += cpm2.o cpm2_pic.o +obj-$(CONFIG_CPM2) += cpm2.o cpm2_pic.o cpm_gpio.o +obj-$(CONFIG_8xx_GPIO) += cpm_gpio.o obj-$(CONFIG_QUICC_ENGINE) += cpm_common.o obj-$(CONFIG_PPC_DCR) += dcr.o obj-$(CONFIG_UCODE_PATCH) += micropatch.o |
