diff options
| author | Calvin Johnson <calvin.johnson@nxp.com> | 2017-11-01 11:11:30 +0530 |
|---|---|---|
| committer | Dong Aisheng <aisheng.dong@nxp.com> | 2019-12-02 18:05:11 +0800 |
| commit | d736dfa7d054e98672782e299b766f53d5e14857 (patch) | |
| tree | b21bbbe10086cc2d5fe94d72acedf23a4e344034 | |
| parent | 69b54742b6144784dd6cea884ecb04700ccfeeaf (diff) | |
staging: fsl_ppfe/eth: add pfe support to Kconfig and Makefile
Signed-off-by: Calvin Johnson <calvin.johnson@nxp.com>
[ Aisheng: fix minor conflict due to removed VBOXSF_FS ]
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
| -rw-r--r-- | MAINTAINERS | 8 | ||||
| -rw-r--r-- | drivers/staging/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/staging/Makefile | 1 |
3 files changed, 10 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 7bd9821efa04..63b51f42f31b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6574,6 +6574,14 @@ F: drivers/ptp/ptp_qoriq_debugfs.c F: include/linux/fsl/ptp_qoriq.h F: Documentation/devicetree/bindings/ptp/ptp-qoriq.txt +FREESCALE QORIQ PPFE ETHERNET DRIVER +M: Anji Jagarlmudi <anji.jagarlmudi@nxp.com> +M: Calvin Johnson <calvin.johnson@nxp.com> +L: netdev@vger.kernel.org +S: Maintained +F: drivers/staging/fsl_ppfe +F: Documentation/devicetree/bindings/net/fsl_ppfe/pfe.txt + FREESCALE QUAD SPI DRIVER M: Han Xu <han.xu@nxp.com> L: linux-spi@vger.kernel.org diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 1ef8c1544651..85916a1b782a 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -126,5 +126,6 @@ source "drivers/staging/exfat/Kconfig" source "drivers/staging/qlge/Kconfig" source "drivers/staging/fsl_qbman/Kconfig" +source "drivers/staging/fsl_ppfe/Kconfig" endif # STAGING diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index d89b4090bdbd..c1f08fb939ac 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -54,3 +54,4 @@ obj-$(CONFIG_USB_WUSB) += wusbcore/ obj-$(CONFIG_EXFAT_FS) += exfat/ obj-$(CONFIG_QLGE) += qlge/ obj-$(CONFIG_FSL_SDK_DPA) += fsl_qbman/ +obj-$(CONFIG_FSL_PPFE) += fsl_ppfe/ |