From 7a4e9f256fef6e10ee5f3ab2a72337fdc4be903c Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 4 Jul 2017 07:05:16 +0100 Subject: [PATCH] minor config cleanup (NFC) --- baseconfig/{ => arm}/CONFIG_PINCTRL_MSM8994 | 0 baseconfig/arm/armv7/CONFIG_PINCTRL_IMX35 | 1 - kernel-armv7hl-debug.config | 1 - kernel-armv7hl-lpae-debug.config | 1 - kernel-armv7hl-lpae.config | 1 - kernel-armv7hl.config | 1 - kernel-i686-PAE.config | 1 - kernel-i686-PAEdebug.config | 1 - kernel-i686-debug.config | 1 - kernel-i686.config | 1 - kernel-ppc64-debug.config | 1 - kernel-ppc64.config | 1 - kernel-ppc64le-debug.config | 1 - kernel-ppc64le.config | 1 - kernel-ppc64p7-debug.config | 1 - kernel-ppc64p7.config | 1 - kernel-s390x-debug.config | 1 - kernel-s390x.config | 1 - kernel-x86_64-debug.config | 1 - kernel-x86_64.config | 1 - 20 files changed, 19 deletions(-) rename baseconfig/{ => arm}/CONFIG_PINCTRL_MSM8994 (100%) delete mode 100644 baseconfig/arm/armv7/CONFIG_PINCTRL_IMX35 diff --git a/baseconfig/CONFIG_PINCTRL_MSM8994 b/baseconfig/arm/CONFIG_PINCTRL_MSM8994 similarity index 100% rename from baseconfig/CONFIG_PINCTRL_MSM8994 rename to baseconfig/arm/CONFIG_PINCTRL_MSM8994 diff --git a/baseconfig/arm/armv7/CONFIG_PINCTRL_IMX35 b/baseconfig/arm/armv7/CONFIG_PINCTRL_IMX35 deleted file mode 100644 index c9a64229e..000000000 --- a/baseconfig/arm/armv7/CONFIG_PINCTRL_IMX35 +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_PINCTRL_IMX35 is not set diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index c43833ea8..c9373a112 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -4301,7 +4301,6 @@ CONFIG_PINCTRL_AS3722=y # CONFIG_PINCTRL_CHERRYVIEW is not set CONFIG_PINCTRL_DOVE=y # CONFIG_PINCTRL_GEMINILAKE is not set -# CONFIG_PINCTRL_IMX35 is not set CONFIG_PINCTRL_IMX6SL=y # CONFIG_PINCTRL_IPQ4019 is not set # CONFIG_PINCTRL_IPQ8064 is not set diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index dfe2e6df1..2836bf70b 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -4077,7 +4077,6 @@ CONFIG_PINCTRL_AS3722=y # CONFIG_PINCTRL_CHERRYVIEW is not set CONFIG_PINCTRL_DOVE=y # CONFIG_PINCTRL_GEMINILAKE is not set -# CONFIG_PINCTRL_IMX35 is not set # CONFIG_PINCTRL_IPQ4019 is not set # CONFIG_PINCTRL_IPQ8064 is not set # CONFIG_PINCTRL_MDM9615 is not set diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 545ff0d20..33de2ce13 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -4056,7 +4056,6 @@ CONFIG_PINCTRL_AS3722=y # CONFIG_PINCTRL_CHERRYVIEW is not set CONFIG_PINCTRL_DOVE=y # CONFIG_PINCTRL_GEMINILAKE is not set -# CONFIG_PINCTRL_IMX35 is not set # CONFIG_PINCTRL_IPQ4019 is not set # CONFIG_PINCTRL_IPQ8064 is not set # CONFIG_PINCTRL_MDM9615 is not set diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 3fc5f1d5d..8841ff5a5 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -4280,7 +4280,6 @@ CONFIG_PINCTRL_AS3722=y # CONFIG_PINCTRL_CHERRYVIEW is not set CONFIG_PINCTRL_DOVE=y # CONFIG_PINCTRL_GEMINILAKE is not set -# CONFIG_PINCTRL_IMX35 is not set CONFIG_PINCTRL_IMX6SL=y # CONFIG_PINCTRL_IPQ4019 is not set # CONFIG_PINCTRL_IPQ8064 is not set diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index 7dbc987f4..fb0ef9f69 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -3845,7 +3845,6 @@ CONFIG_PINCTRL_BAYTRAIL=y CONFIG_PINCTRL_BROXTON=m CONFIG_PINCTRL_CHERRYVIEW=y # CONFIG_PINCTRL_GEMINILAKE is not set -# CONFIG_PINCTRL_MSM8994 is not set # CONFIG_PINCTRL_SINGLE is not set CONFIG_PINCTRL_SUNRISEPOINT=m # CONFIG_PINCTRL_SX150X is not set diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index f4dd95edd..b5b12ee62 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -3865,7 +3865,6 @@ CONFIG_PINCTRL_BAYTRAIL=y CONFIG_PINCTRL_BROXTON=m CONFIG_PINCTRL_CHERRYVIEW=y # CONFIG_PINCTRL_GEMINILAKE is not set -# CONFIG_PINCTRL_MSM8994 is not set # CONFIG_PINCTRL_SINGLE is not set CONFIG_PINCTRL_SUNRISEPOINT=m # CONFIG_PINCTRL_SX150X is not set diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 824cc8629..92c2209dd 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -3865,7 +3865,6 @@ CONFIG_PINCTRL_BAYTRAIL=y CONFIG_PINCTRL_BROXTON=m CONFIG_PINCTRL_CHERRYVIEW=y # CONFIG_PINCTRL_GEMINILAKE is not set -# CONFIG_PINCTRL_MSM8994 is not set # CONFIG_PINCTRL_SINGLE is not set CONFIG_PINCTRL_SUNRISEPOINT=m # CONFIG_PINCTRL_SX150X is not set diff --git a/kernel-i686.config b/kernel-i686.config index 5d49673c9..28146d296 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -3845,7 +3845,6 @@ CONFIG_PINCTRL_BAYTRAIL=y CONFIG_PINCTRL_BROXTON=m CONFIG_PINCTRL_CHERRYVIEW=y # CONFIG_PINCTRL_GEMINILAKE is not set -# CONFIG_PINCTRL_MSM8994 is not set # CONFIG_PINCTRL_SINGLE is not set CONFIG_PINCTRL_SUNRISEPOINT=m # CONFIG_PINCTRL_SX150X is not set diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index 6bf1e6798..8dc6ee878 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -3660,7 +3660,6 @@ CONFIG_PHYLIB=y CONFIG_PID_NS=y # CONFIG_PINCONF is not set # CONFIG_PINCTRL is not set -# CONFIG_PINCTRL_MSM8994 is not set # CONFIG_PINCTRL_SX150X is not set # CONFIG_PINMUX is not set CONFIG_PKCS7_MESSAGE_PARSER=y diff --git a/kernel-ppc64.config b/kernel-ppc64.config index 33041022f..fae555e83 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -3638,7 +3638,6 @@ CONFIG_PHYLIB=y CONFIG_PID_NS=y # CONFIG_PINCONF is not set # CONFIG_PINCTRL is not set -# CONFIG_PINCTRL_MSM8994 is not set # CONFIG_PINCTRL_SX150X is not set # CONFIG_PINMUX is not set CONFIG_PKCS7_MESSAGE_PARSER=y diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 732bd00c6..a61e08344 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -3603,7 +3603,6 @@ CONFIG_PHYLIB=y CONFIG_PID_NS=y # CONFIG_PINCONF is not set # CONFIG_PINCTRL is not set -# CONFIG_PINCTRL_MSM8994 is not set # CONFIG_PINCTRL_SX150X is not set # CONFIG_PINMUX is not set CONFIG_PKCS7_MESSAGE_PARSER=y diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 37f051f05..5addb711b 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -3581,7 +3581,6 @@ CONFIG_PHYLIB=y CONFIG_PID_NS=y # CONFIG_PINCONF is not set # CONFIG_PINCTRL is not set -# CONFIG_PINCTRL_MSM8994 is not set # CONFIG_PINCTRL_SX150X is not set # CONFIG_PINMUX is not set CONFIG_PKCS7_MESSAGE_PARSER=y diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config index 19b4634ba..4702b6d88 100644 --- a/kernel-ppc64p7-debug.config +++ b/kernel-ppc64p7-debug.config @@ -3602,7 +3602,6 @@ CONFIG_PHYLIB=y CONFIG_PID_NS=y # CONFIG_PINCONF is not set # CONFIG_PINCTRL is not set -# CONFIG_PINCTRL_MSM8994 is not set # CONFIG_PINCTRL_SX150X is not set # CONFIG_PINMUX is not set CONFIG_PKCS7_MESSAGE_PARSER=y diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config index b1058a8b1..835f85ecc 100644 --- a/kernel-ppc64p7.config +++ b/kernel-ppc64p7.config @@ -3580,7 +3580,6 @@ CONFIG_PHYLIB=y CONFIG_PID_NS=y # CONFIG_PINCONF is not set # CONFIG_PINCTRL is not set -# CONFIG_PINCTRL_MSM8994 is not set # CONFIG_PINCTRL_SX150X is not set # CONFIG_PINMUX is not set CONFIG_PKCS7_MESSAGE_PARSER=y diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index d3107b82b..262dfc4fa 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -3531,7 +3531,6 @@ CONFIG_PHYLIB=m CONFIG_PID_NS=y # CONFIG_PINCONF is not set # CONFIG_PINCTRL is not set -# CONFIG_PINCTRL_MSM8994 is not set # CONFIG_PINCTRL_SX150X is not set # CONFIG_PINMUX is not set CONFIG_PKCS7_MESSAGE_PARSER=y diff --git a/kernel-s390x.config b/kernel-s390x.config index 91c7df7ce..a4a5bb316 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -3509,7 +3509,6 @@ CONFIG_PHYLIB=m CONFIG_PID_NS=y # CONFIG_PINCONF is not set # CONFIG_PINCTRL is not set -# CONFIG_PINCTRL_MSM8994 is not set # CONFIG_PINCTRL_SX150X is not set # CONFIG_PINMUX is not set CONFIG_PKCS7_MESSAGE_PARSER=y diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 34cb7bef2..1f9baba2e 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -3905,7 +3905,6 @@ CONFIG_PINCTRL_BAYTRAIL=y CONFIG_PINCTRL_BROXTON=m CONFIG_PINCTRL_CHERRYVIEW=y # CONFIG_PINCTRL_GEMINILAKE is not set -# CONFIG_PINCTRL_MSM8994 is not set CONFIG_PINCTRL_SUNRISEPOINT=m # CONFIG_PINCTRL_SX150X is not set CONFIG_PINCTRL=y diff --git a/kernel-x86_64.config b/kernel-x86_64.config index c9b2d05a0..2b589dcbf 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -3885,7 +3885,6 @@ CONFIG_PINCTRL_BAYTRAIL=y CONFIG_PINCTRL_BROXTON=m CONFIG_PINCTRL_CHERRYVIEW=y # CONFIG_PINCTRL_GEMINILAKE is not set -# CONFIG_PINCTRL_MSM8994 is not set CONFIG_PINCTRL_SUNRISEPOINT=m # CONFIG_PINCTRL_SX150X is not set CONFIG_PINCTRL=y