diff options
author | Roy Pledge <roy.pledge@nxp.com> | 2018-07-24 10:21:30 -0400 |
---|---|---|
committer | Li Yang <leoyang.li@nxp.com> | 2018-07-24 17:18:55 -0400 |
commit | 2940882f65e07f5eacbb7d35d52379a54f567a59 (patch) | |
tree | 593744481ca77d4e75945534fc1924690f402247 | |
parent | c89105c9b39037bbf2aca0614e39afe176e867c5 (diff) |
staging: fsl-mc: Remove remaining files
Remove the staging/drivers/fsl-mc directory from the staging
area now that all the components have been moved to the main
kernel areas.
Signed-off-by: Roy Pledge <roy.pledge@nxp.com>
Reviewed-by: Horia Geantă <horia.geanta@nxp.com>
Reviewed-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
Signed-off-by: Li Yang <leoyang.li@nxp.com>
-rw-r--r-- | drivers/staging/Kconfig | 2 | ||||
-rw-r--r-- | drivers/staging/Makefile | 1 | ||||
-rw-r--r-- | drivers/staging/fsl-mc/Kconfig | 2 | ||||
-rw-r--r-- | drivers/staging/fsl-mc/Makefile | 3 | ||||
-rw-r--r-- | drivers/staging/fsl-mc/bus/Kconfig | 7 | ||||
-rw-r--r-- | drivers/staging/fsl-mc/bus/Makefile | 7 |
6 files changed, 0 insertions, 22 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 75a480497d22..47b61c351838 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig | |||
@@ -92,8 +92,6 @@ source "drivers/staging/clocking-wizard/Kconfig" | |||
92 | 92 | ||
93 | source "drivers/staging/fbtft/Kconfig" | 93 | source "drivers/staging/fbtft/Kconfig" |
94 | 94 | ||
95 | source "drivers/staging/fsl-mc/Kconfig" | ||
96 | |||
97 | source "drivers/staging/fsl-dpaa2/Kconfig" | 95 | source "drivers/staging/fsl-dpaa2/Kconfig" |
98 | 96 | ||
99 | source "drivers/staging/wilc1000/Kconfig" | 97 | source "drivers/staging/wilc1000/Kconfig" |
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index e84959a8a684..bfef8f230e16 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile | |||
@@ -37,7 +37,6 @@ obj-$(CONFIG_CRYPTO_SKEIN) += skein/ | |||
37 | obj-$(CONFIG_UNISYSSPAR) += unisys/ | 37 | obj-$(CONFIG_UNISYSSPAR) += unisys/ |
38 | obj-$(CONFIG_COMMON_CLK_XLNX_CLKWZRD) += clocking-wizard/ | 38 | obj-$(CONFIG_COMMON_CLK_XLNX_CLKWZRD) += clocking-wizard/ |
39 | obj-$(CONFIG_FB_TFT) += fbtft/ | 39 | obj-$(CONFIG_FB_TFT) += fbtft/ |
40 | obj-$(CONFIG_FSL_MC_BUS) += fsl-mc/ | ||
41 | obj-$(CONFIG_FSL_DPAA2) += fsl-dpaa2/ | 40 | obj-$(CONFIG_FSL_DPAA2) += fsl-dpaa2/ |
42 | obj-$(CONFIG_WILC1000) += wilc1000/ | 41 | obj-$(CONFIG_WILC1000) += wilc1000/ |
43 | obj-$(CONFIG_MOST) += most/ | 42 | obj-$(CONFIG_MOST) += most/ |
diff --git a/drivers/staging/fsl-mc/Kconfig b/drivers/staging/fsl-mc/Kconfig deleted file mode 100644 index 3002229bec1b..000000000000 --- a/drivers/staging/fsl-mc/Kconfig +++ /dev/null | |||
@@ -1,2 +0,0 @@ | |||
1 | # SPDX-License-Identifier: GPL-2.0 | ||
2 | source "drivers/staging/fsl-mc/bus/Kconfig" | ||
diff --git a/drivers/staging/fsl-mc/Makefile b/drivers/staging/fsl-mc/Makefile deleted file mode 100644 index 14683889dabd..000000000000 --- a/drivers/staging/fsl-mc/Makefile +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | # SPDX-License-Identifier: GPL-2.0 | ||
2 | # Freescale Management Complex (MC) bus drivers | ||
3 | obj-$(CONFIG_FSL_MC_BUS) += bus/ | ||
diff --git a/drivers/staging/fsl-mc/bus/Kconfig b/drivers/staging/fsl-mc/bus/Kconfig deleted file mode 100644 index 90f234deb1de..000000000000 --- a/drivers/staging/fsl-mc/bus/Kconfig +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | # SPDX-License-Identifier: GPL-2.0 | ||
2 | # | ||
3 | # DPAA2 fsl-mc bus | ||
4 | # | ||
5 | # Copyright (C) 2014-2016 Freescale Semiconductor, Inc. | ||
6 | # | ||
7 | |||
diff --git a/drivers/staging/fsl-mc/bus/Makefile b/drivers/staging/fsl-mc/bus/Makefile deleted file mode 100644 index 2141e4b590b2..000000000000 --- a/drivers/staging/fsl-mc/bus/Makefile +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | # SPDX-License-Identifier: GPL-2.0 | ||
2 | # | ||
3 | # Freescale Management Complex (MC) bus drivers | ||
4 | # | ||
5 | # Copyright (C) 2014 Freescale Semiconductor, Inc. | ||
6 | # | ||
7 | |||