diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2016-01-14 09:55:01 +1100 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-01-14 09:55:01 +1100 |
commit | be6bfc29bc759670fb3a2519325c4ab2edf259c9 (patch) | |
tree | e4ffd461d48ecd984b6f250834dcccf099b1f6b9 /arch/powerpc/sysdev/Makefile | |
parent | a61674bdfc7c2bf909c4010699607b62b69b7bec (diff) | |
parent | 44451d4d8f0e35153b3e7e3d40e198f2cf9ac36a (diff) | |
download | linux-be6bfc29bc759670fb3a2519325c4ab2edf259c9.tar.bz2 |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next
Freescale updates from Scott:
"Highlights include moving QE code out of arch/powerpc (to be shared with
arm), device tree updates, and minor fixes."
Diffstat (limited to 'arch/powerpc/sysdev/Makefile')
-rw-r--r-- | arch/powerpc/sysdev/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile index 5b492a6438ff..bd6bd729969c 100644 --- a/arch/powerpc/sysdev/Makefile +++ b/arch/powerpc/sysdev/Makefile @@ -26,7 +26,6 @@ obj-$(CONFIG_FSL_85XX_CACHE_SRAM) += fsl_85xx_l2ctlr.o fsl_85xx_cache_sram.o obj-$(CONFIG_SIMPLE_GPIO) += simple_gpio.o obj-$(CONFIG_FSL_RIO) += fsl_rio.o fsl_rmu.o obj-$(CONFIG_TSI108_BRIDGE) += tsi108_pci.o tsi108_dev.o -obj-$(CONFIG_QUICC_ENGINE) += qe_lib/ mv64x60-$(CONFIG_PCI) += mv64x60_pci.o obj-$(CONFIG_MV64X60) += $(mv64x60-y) mv64x60_pic.o mv64x60_dev.o \ mv64x60_udbg.o |