git.openwrt.org Git - openwrt/staging/mkresin.git/blob

   1 From 022999fe6c4008d1ca6ec0f33d7f7c88db97f3fa Mon Sep 17 00:00:00 2001
   2 From: Calvin Johnson <calvin.johnson@nxp.com>
   3 Date: Wed, 1 Nov 2017 11:11:30 +0530
   4 Subject: [PATCH] staging: fsl_ppfe/eth: add pfe support to Kconfig and
   5  Makefile
   6
   7 Signed-off-by: Calvin Johnson <calvin.johnson@nxp.com>
   8 [ Aisheng: fix minor conflict due to removed VBOXSF_FS ]
   9 Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
  10 ---
  11  MAINTAINERS              | 8 ++++++++
  12  drivers/staging/Kconfig  | 1 +
  13  drivers/staging/Makefile | 1 +
  14  3 files changed, 10 insertions(+)
  15
  16 --- a/MAINTAINERS
  17 +++ b/MAINTAINERS
  18 @@ -6574,6 +6574,14 @@ F:       drivers/ptp/ptp_qoriq_debugfs.c
  19  F:     include/linux/fsl/ptp_qoriq.h
  20  F:     Documentation/devicetree/bindings/ptp/ptp-qoriq.txt
  21
  22 +FREESCALE QORIQ PPFE ETHERNET DRIVER
  23 +M:     Anji Jagarlmudi <anji.jagarlmudi@nxp.com>
  24 +M:     Calvin Johnson <calvin.johnson@nxp.com>
  25 +L:     netdev@vger.kernel.org
  26 +S:     Maintained
  27 +F:     drivers/staging/fsl_ppfe
  28 +F:     Documentation/devicetree/bindings/net/fsl_ppfe/pfe.txt
  29 +
  30  FREESCALE QUAD SPI DRIVER
  31  M:     Han Xu <han.xu@nxp.com>
  32  L:     linux-spi@vger.kernel.org
  33 --- a/drivers/staging/Kconfig
  34 +++ b/drivers/staging/Kconfig
  35 @@ -126,5 +126,6 @@ source "drivers/staging/exfat/Kconfig"
  36  source "drivers/staging/qlge/Kconfig"
  37
  38  source "drivers/staging/fsl_qbman/Kconfig"
  39 +source "drivers/staging/fsl_ppfe/Kconfig"
  40
  41  endif # STAGING
  42 --- a/drivers/staging/Makefile
  43 +++ b/drivers/staging/Makefile
  44 @@ -54,3 +54,4 @@ obj-$(CONFIG_USB_WUSB)                += wusbcore/
  45  obj-$(CONFIG_EXFAT_FS)         += exfat/
  46  obj-$(CONFIG_QLGE)             += qlge/
  47  obj-$(CONFIG_FSL_SDK_DPA)      += fsl_qbman/
  48 +obj-$(CONFIG_FSL_PPFE)         += fsl_ppfe/