diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2016-10-11 12:07:56 +0300 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-10-11 12:07:56 +0300 |
| commit | 065397a969a0f80624598c5030c2551abbd986fd (patch) | |
| tree | 60a4c453e6b494c8b3973497c577efa2f10102e4 /drivers/soc/fsl/Makefile | |
| parent | 8321564a11bbeadffcc7d6335bcf3c07e5c397a3 (diff) | |
| parent | e0b80f00bb96b925995d53980e0c764430bedb42 (diff) | |
| download | linux-065397a969a0f80624598c5030c2551abbd986fd.tar.xz | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next
Freescale updates from Scott:
"Highlights include qbman support (a prerequisite for datapath drivers
such as ethernet), a PCI DMA fix+improvement, reset handler changes, more
8xx optimizations, and some cleanups and fixes."
Diffstat (limited to 'drivers/soc/fsl/Makefile')
| -rw-r--r-- | drivers/soc/fsl/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/soc/fsl/Makefile b/drivers/soc/fsl/Makefile index 203307fd92c1..75e1f5334821 100644 --- a/drivers/soc/fsl/Makefile +++ b/drivers/soc/fsl/Makefile @@ -2,5 +2,6 @@ # Makefile for the Linux Kernel SOC fsl specific device drivers # +obj-$(CONFIG_FSL_DPAA) += qbman/ obj-$(CONFIG_QUICC_ENGINE) += qe/ obj-$(CONFIG_CPM) += qe/ |