diff options
| -rw-r--r-- | baseconfig/CONFIG_BT_LEGACY_IOCTL | 1 | ||||
| -rw-r--r-- | baseconfig/CONFIG_PHY_MVEBU_CP110_COMPHY | 2 | ||||
| -rw-r--r-- | baseconfig/arm/arm64/CONFIG_PHY_MVEBU_CP110_COMPHY | 1 | ||||
| -rw-r--r-- | kernel-aarch64-debug.config | 1 | ||||
| -rw-r--r-- | kernel-aarch64.config | 1 | ||||
| -rw-r--r-- | kernel-armv7hl-debug.config | 3 | ||||
| -rw-r--r-- | kernel-armv7hl-lpae-debug.config | 3 | ||||
| -rw-r--r-- | kernel-armv7hl-lpae.config | 3 | ||||
| -rw-r--r-- | kernel-armv7hl.config | 3 | ||||
| -rw-r--r-- | kernel-i686-PAE.config | 3 | ||||
| -rw-r--r-- | kernel-i686-PAEdebug.config | 3 | ||||
| -rw-r--r-- | kernel-i686-debug.config | 3 | ||||
| -rw-r--r-- | kernel-i686.config | 3 | ||||
| -rw-r--r-- | kernel-ppc64-debug.config | 3 | ||||
| -rw-r--r-- | kernel-ppc64.config | 3 | ||||
| -rw-r--r-- | kernel-ppc64le-debug.config | 3 | ||||
| -rw-r--r-- | kernel-ppc64le.config | 3 | ||||
| -rw-r--r-- | kernel-s390x-debug.config | 3 | ||||
| -rw-r--r-- | kernel-s390x.config | 3 | ||||
| -rw-r--r-- | kernel-x86_64-debug.config | 3 | ||||
| -rw-r--r-- | kernel-x86_64.config | 3 |
21 files changed, 18 insertions, 36 deletions
diff --git a/baseconfig/CONFIG_BT_LEGACY_IOCTL b/baseconfig/CONFIG_BT_LEGACY_IOCTL deleted file mode 100644 index e2349cdee..000000000 --- a/baseconfig/CONFIG_BT_LEGACY_IOCTL +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_BT_LEGACY_IOCTL is not set diff --git a/baseconfig/CONFIG_PHY_MVEBU_CP110_COMPHY b/baseconfig/CONFIG_PHY_MVEBU_CP110_COMPHY index 1902b0c1f..8c104689f 100644 --- a/baseconfig/CONFIG_PHY_MVEBU_CP110_COMPHY +++ b/baseconfig/CONFIG_PHY_MVEBU_CP110_COMPHY @@ -1 +1 @@ -CONFIG_PHY_MVEBU_CP110_COMPHY=m +# CONFIG_PHY_MVEBU_CP110_COMPHY is not set diff --git a/baseconfig/arm/arm64/CONFIG_PHY_MVEBU_CP110_COMPHY b/baseconfig/arm/arm64/CONFIG_PHY_MVEBU_CP110_COMPHY new file mode 100644 index 000000000..1902b0c1f --- /dev/null +++ b/baseconfig/arm/arm64/CONFIG_PHY_MVEBU_CP110_COMPHY @@ -0,0 +1 @@ +CONFIG_PHY_MVEBU_CP110_COMPHY=m diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 2a9a75a85..003d2acdf 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -669,7 +669,6 @@ CONFIG_BT_HCIVHCI=m CONFIG_BT_HIDP=m CONFIG_BT_HS=y CONFIG_BT_LEDS=y -# CONFIG_BT_LEGACY_IOCTL is not set CONFIG_BT_LE=y CONFIG_BT=m CONFIG_BT_MRVL=m diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 7cc63e99c..29fbe2d6c 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -669,7 +669,6 @@ CONFIG_BT_HCIVHCI=m CONFIG_BT_HIDP=m CONFIG_BT_HS=y CONFIG_BT_LEDS=y -# CONFIG_BT_LEGACY_IOCTL is not set CONFIG_BT_LE=y CONFIG_BT=m CONFIG_BT_MRVL=m diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 2539e2423..3b837e2ef 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -710,7 +710,6 @@ CONFIG_BT_HCIVHCI=m CONFIG_BT_HIDP=m CONFIG_BT_HS=y CONFIG_BT_LEDS=y -# CONFIG_BT_LEGACY_IOCTL is not set CONFIG_BT_LE=y CONFIG_BT=m CONFIG_BT_MRVL=m @@ -4338,7 +4337,7 @@ CONFIG_PHY_MESON8B_USB2=m # CONFIG_PHY_MESON_GXL_USB2 is not set CONFIG_PHY_MIPHY28LP=m # CONFIG_PHY_MIPHY365X is not set -CONFIG_PHY_MVEBU_CP110_COMPHY=m +# CONFIG_PHY_MVEBU_CP110_COMPHY is not set CONFIG_PHY_MVEBU_SATA=y # CONFIG_PHY_PXA_28NM_HSIC is not set # CONFIG_PHY_PXA_28NM_USB2 is not set diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index feb02ba3b..40a6ab085 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -686,7 +686,6 @@ CONFIG_BT_HCIVHCI=m CONFIG_BT_HIDP=m CONFIG_BT_HS=y CONFIG_BT_LEDS=y -# CONFIG_BT_LEGACY_IOCTL is not set CONFIG_BT_LE=y CONFIG_BT=m CONFIG_BT_MRVL=m @@ -4114,7 +4113,7 @@ CONFIG_PHYLIB=y CONFIG_PHYLINK=m CONFIG_PHY_MESON8B_USB2=m # CONFIG_PHY_MESON_GXL_USB2 is not set -CONFIG_PHY_MVEBU_CP110_COMPHY=m +# CONFIG_PHY_MVEBU_CP110_COMPHY is not set CONFIG_PHY_MVEBU_SATA=y # CONFIG_PHY_PXA_28NM_HSIC is not set # CONFIG_PHY_PXA_28NM_USB2 is not set diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 06bb6e6b1..926247542 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -685,7 +685,6 @@ CONFIG_BT_HCIVHCI=m CONFIG_BT_HIDP=m CONFIG_BT_HS=y CONFIG_BT_LEDS=y -# CONFIG_BT_LEGACY_IOCTL is not set CONFIG_BT_LE=y CONFIG_BT=m CONFIG_BT_MRVL=m @@ -4093,7 +4092,7 @@ CONFIG_PHYLIB=y CONFIG_PHYLINK=m CONFIG_PHY_MESON8B_USB2=m # CONFIG_PHY_MESON_GXL_USB2 is not set -CONFIG_PHY_MVEBU_CP110_COMPHY=m +# CONFIG_PHY_MVEBU_CP110_COMPHY is not set CONFIG_PHY_MVEBU_SATA=y # CONFIG_PHY_PXA_28NM_HSIC is not set # CONFIG_PHY_PXA_28NM_USB2 is not set diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 0554bb20e..35dcc48ef 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -709,7 +709,6 @@ CONFIG_BT_HCIVHCI=m CONFIG_BT_HIDP=m CONFIG_BT_HS=y CONFIG_BT_LEDS=y -# CONFIG_BT_LEGACY_IOCTL is not set CONFIG_BT_LE=y CONFIG_BT=m CONFIG_BT_MRVL=m @@ -4317,7 +4316,7 @@ CONFIG_PHY_MESON8B_USB2=m # CONFIG_PHY_MESON_GXL_USB2 is not set CONFIG_PHY_MIPHY28LP=m # CONFIG_PHY_MIPHY365X is not set -CONFIG_PHY_MVEBU_CP110_COMPHY=m +# CONFIG_PHY_MVEBU_CP110_COMPHY is not set CONFIG_PHY_MVEBU_SATA=y # CONFIG_PHY_PXA_28NM_HSIC is not set # CONFIG_PHY_PXA_28NM_USB2 is not set diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index ea6108c66..7454cb4dd 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -578,7 +578,6 @@ CONFIG_BT_HCIVHCI=m CONFIG_BT_HIDP=m CONFIG_BT_HS=y CONFIG_BT_LEDS=y -# CONFIG_BT_LEGACY_IOCTL is not set CONFIG_BT_LE=y CONFIG_BT=m CONFIG_BT_MRVL=m @@ -3901,7 +3900,7 @@ CONFIG_PERSISTENT_KEYRINGS=y # CONFIG_PHY_CPCAP_USB is not set CONFIG_PHYLIB=y CONFIG_PHYLINK=m -CONFIG_PHY_MVEBU_CP110_COMPHY=m +# CONFIG_PHY_MVEBU_CP110_COMPHY is not set # CONFIG_PHY_PXA_28NM_HSIC is not set # CONFIG_PHY_PXA_28NM_USB2 is not set # CONFIG_PHY_QCOM_USB_HSIC is not set diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index c3dd1bfd3..cc64f9559 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -579,7 +579,6 @@ CONFIG_BT_HCIVHCI=m CONFIG_BT_HIDP=m CONFIG_BT_HS=y CONFIG_BT_LEDS=y -# CONFIG_BT_LEGACY_IOCTL is not set CONFIG_BT_LE=y CONFIG_BT=m CONFIG_BT_MRVL=m @@ -3921,7 +3920,7 @@ CONFIG_PERSISTENT_KEYRINGS=y # CONFIG_PHY_CPCAP_USB is not set CONFIG_PHYLIB=y CONFIG_PHYLINK=m -CONFIG_PHY_MVEBU_CP110_COMPHY=m +# CONFIG_PHY_MVEBU_CP110_COMPHY is not set # CONFIG_PHY_PXA_28NM_HSIC is not set # CONFIG_PHY_PXA_28NM_USB2 is not set # CONFIG_PHY_QCOM_USB_HSIC is not set diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 6df9e7c00..6eb455f49 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -579,7 +579,6 @@ CONFIG_BT_HCIVHCI=m CONFIG_BT_HIDP=m CONFIG_BT_HS=y CONFIG_BT_LEDS=y -# CONFIG_BT_LEGACY_IOCTL is not set CONFIG_BT_LE=y CONFIG_BT=m CONFIG_BT_MRVL=m @@ -3921,7 +3920,7 @@ CONFIG_PERSISTENT_KEYRINGS=y # CONFIG_PHY_CPCAP_USB is not set CONFIG_PHYLIB=y CONFIG_PHYLINK=m -CONFIG_PHY_MVEBU_CP110_COMPHY=m +# CONFIG_PHY_MVEBU_CP110_COMPHY is not set # CONFIG_PHY_PXA_28NM_HSIC is not set # CONFIG_PHY_PXA_28NM_USB2 is not set # CONFIG_PHY_QCOM_USB_HSIC is not set diff --git a/kernel-i686.config b/kernel-i686.config index 0ac39cc94..ecfc1576f 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -578,7 +578,6 @@ CONFIG_BT_HCIVHCI=m CONFIG_BT_HIDP=m CONFIG_BT_HS=y CONFIG_BT_LEDS=y -# CONFIG_BT_LEGACY_IOCTL is not set CONFIG_BT_LE=y CONFIG_BT=m CONFIG_BT_MRVL=m @@ -3901,7 +3900,7 @@ CONFIG_PERSISTENT_KEYRINGS=y # CONFIG_PHY_CPCAP_USB is not set CONFIG_PHYLIB=y CONFIG_PHYLINK=m -CONFIG_PHY_MVEBU_CP110_COMPHY=m +# CONFIG_PHY_MVEBU_CP110_COMPHY is not set # CONFIG_PHY_PXA_28NM_HSIC is not set # CONFIG_PHY_PXA_28NM_USB2 is not set # CONFIG_PHY_QCOM_USB_HSIC is not set diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index f449437b9..a076f483f 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -564,7 +564,6 @@ CONFIG_BT_HCIVHCI=m CONFIG_BT_HIDP=m CONFIG_BT_HS=y CONFIG_BT_LEDS=y -# CONFIG_BT_LEGACY_IOCTL is not set CONFIG_BT_LE=y CONFIG_BT=m CONFIG_BT_MRVL=m @@ -3711,7 +3710,7 @@ CONFIG_PERSISTENT_KEYRINGS=y # CONFIG_PHY_CPCAP_USB is not set CONFIG_PHYLIB=y CONFIG_PHYLINK=m -CONFIG_PHY_MVEBU_CP110_COMPHY=m +# CONFIG_PHY_MVEBU_CP110_COMPHY is not set # CONFIG_PHY_PXA_28NM_HSIC is not set # CONFIG_PHY_PXA_28NM_USB2 is not set # CONFIG_PHY_QCOM_USB_HSIC is not set diff --git a/kernel-ppc64.config b/kernel-ppc64.config index 5e43c5a96..08f5584fd 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -563,7 +563,6 @@ CONFIG_BT_HCIVHCI=m CONFIG_BT_HIDP=m CONFIG_BT_HS=y CONFIG_BT_LEDS=y -# CONFIG_BT_LEGACY_IOCTL is not set CONFIG_BT_LE=y CONFIG_BT=m CONFIG_BT_MRVL=m @@ -3689,7 +3688,7 @@ CONFIG_PERSISTENT_KEYRINGS=y # CONFIG_PHY_CPCAP_USB is not set CONFIG_PHYLIB=y CONFIG_PHYLINK=m -CONFIG_PHY_MVEBU_CP110_COMPHY=m +# CONFIG_PHY_MVEBU_CP110_COMPHY is not set # CONFIG_PHY_PXA_28NM_HSIC is not set # CONFIG_PHY_PXA_28NM_USB2 is not set # CONFIG_PHY_QCOM_USB_HSIC is not set diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 554fd5f1c..1998317b5 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -520,7 +520,6 @@ CONFIG_BT_HCIVHCI=m CONFIG_BT_HIDP=m CONFIG_BT_HS=y CONFIG_BT_LEDS=y -# CONFIG_BT_LEGACY_IOCTL is not set CONFIG_BT_LE=y CONFIG_BT=m CONFIG_BT_MRVL=m @@ -3653,7 +3652,7 @@ CONFIG_PERSISTENT_KEYRINGS=y # CONFIG_PHY_CPCAP_USB is not set CONFIG_PHYLIB=y CONFIG_PHYLINK=m -CONFIG_PHY_MVEBU_CP110_COMPHY=m +# CONFIG_PHY_MVEBU_CP110_COMPHY is not set # CONFIG_PHY_PXA_28NM_HSIC is not set # CONFIG_PHY_PXA_28NM_USB2 is not set # CONFIG_PHY_QCOM_USB_HSIC is not set diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 1487e5f3b..a8e43f019 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -519,7 +519,6 @@ CONFIG_BT_HCIVHCI=m CONFIG_BT_HIDP=m CONFIG_BT_HS=y CONFIG_BT_LEDS=y -# CONFIG_BT_LEGACY_IOCTL is not set CONFIG_BT_LE=y CONFIG_BT=m CONFIG_BT_MRVL=m @@ -3631,7 +3630,7 @@ CONFIG_PERSISTENT_KEYRINGS=y # CONFIG_PHY_CPCAP_USB is not set CONFIG_PHYLIB=y CONFIG_PHYLINK=m -CONFIG_PHY_MVEBU_CP110_COMPHY=m +# CONFIG_PHY_MVEBU_CP110_COMPHY is not set # CONFIG_PHY_PXA_28NM_HSIC is not set # CONFIG_PHY_PXA_28NM_USB2 is not set # CONFIG_PHY_QCOM_USB_HSIC is not set diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 5cbe42ad1..6ed231359 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -521,7 +521,6 @@ CONFIG_BT_HIDP=m CONFIG_BT_HS=y # CONFIG_BT is not set CONFIG_BT_LEDS=y -# CONFIG_BT_LEGACY_IOCTL is not set CONFIG_BT_LE=y CONFIG_BT_MRVL=m CONFIG_BT_MRVL_SDIO=m @@ -3586,7 +3585,7 @@ CONFIG_PFAULT=y # CONFIG_PHY_CPCAP_USB is not set CONFIG_PHYLIB=m CONFIG_PHYLINK=m -CONFIG_PHY_MVEBU_CP110_COMPHY=m +# CONFIG_PHY_MVEBU_CP110_COMPHY is not set # CONFIG_PHY_PXA_28NM_HSIC is not set # CONFIG_PHY_PXA_28NM_USB2 is not set # CONFIG_PHY_QCOM_USB_HSIC is not set diff --git a/kernel-s390x.config b/kernel-s390x.config index c6c32dc36..734d86b26 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -520,7 +520,6 @@ CONFIG_BT_HIDP=m CONFIG_BT_HS=y # CONFIG_BT is not set CONFIG_BT_LEDS=y -# CONFIG_BT_LEGACY_IOCTL is not set CONFIG_BT_LE=y CONFIG_BT_MRVL=m CONFIG_BT_MRVL_SDIO=m @@ -3564,7 +3563,7 @@ CONFIG_PFAULT=y # CONFIG_PHY_CPCAP_USB is not set CONFIG_PHYLIB=m CONFIG_PHYLINK=m -CONFIG_PHY_MVEBU_CP110_COMPHY=m +# CONFIG_PHY_MVEBU_CP110_COMPHY is not set # CONFIG_PHY_PXA_28NM_HSIC is not set # CONFIG_PHY_PXA_28NM_USB2 is not set # CONFIG_PHY_QCOM_USB_HSIC is not set diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 16540ab31..be912f757 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -591,7 +591,6 @@ CONFIG_BT_HCIVHCI=m CONFIG_BT_HIDP=m CONFIG_BT_HS=y CONFIG_BT_LEDS=y -# CONFIG_BT_LEGACY_IOCTL is not set CONFIG_BT_LE=y CONFIG_BT=m CONFIG_BT_MRVL=m @@ -3965,7 +3964,7 @@ CONFIG_PERSISTENT_KEYRINGS=y # CONFIG_PHY_CPCAP_USB is not set CONFIG_PHYLIB=y CONFIG_PHYLINK=m -CONFIG_PHY_MVEBU_CP110_COMPHY=m +# CONFIG_PHY_MVEBU_CP110_COMPHY is not set # CONFIG_PHY_PXA_28NM_HSIC is not set # CONFIG_PHY_PXA_28NM_USB2 is not set # CONFIG_PHY_QCOM_USB_HSIC is not set diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 819e0248d..32262b2a0 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -590,7 +590,6 @@ CONFIG_BT_HCIVHCI=m CONFIG_BT_HIDP=m CONFIG_BT_HS=y CONFIG_BT_LEDS=y -# CONFIG_BT_LEGACY_IOCTL is not set CONFIG_BT_LE=y CONFIG_BT=m CONFIG_BT_MRVL=m @@ -3945,7 +3944,7 @@ CONFIG_PERSISTENT_KEYRINGS=y # CONFIG_PHY_CPCAP_USB is not set CONFIG_PHYLIB=y CONFIG_PHYLINK=m -CONFIG_PHY_MVEBU_CP110_COMPHY=m +# CONFIG_PHY_MVEBU_CP110_COMPHY is not set # CONFIG_PHY_PXA_28NM_HSIC is not set # CONFIG_PHY_PXA_28NM_USB2 is not set # CONFIG_PHY_QCOM_USB_HSIC is not set |