summaryrefslogtreecommitdiffstats
path: root/baseconfig/x86
diff options
context:
space:
mode:
authorLaura Abbott <labbott@fedoraproject.org>2017-07-05 09:00:04 -0700
committerLaura Abbott <labbott@fedoraproject.org>2017-07-05 10:42:49 -0700
commitad5e497980a0a9ff7f755802be372e1a8424be2e (patch)
treeb77d4465119f4d21ef764f122dbe46c3af8c9710 /baseconfig/x86
parentc85a9906f9b5f136cbaa7c53beafddaa04d89e36 (diff)
downloadkernel-ad5e497980a0a9ff7f755802be372e1a8424be2e.tar.gz
kernel-ad5e497980a0a9ff7f755802be372e1a8424be2e.tar.xz
kernel-ad5e497980a0a9ff7f755802be372e1a8424be2e.zip
Linux v4.12-3441-g1996454
Diffstat (limited to 'baseconfig/x86')
-rw-r--r--baseconfig/x86/CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH1
-rw-r--r--baseconfig/x86/CONFIG_EXTCON1
-rw-r--r--baseconfig/x86/CONFIG_EXTCON_GPIO (renamed from baseconfig/x86/x86_64/CONFIG_EXTCON_GPIO)0
-rw-r--r--baseconfig/x86/CONFIG_EXTCON_MAX3355 (renamed from baseconfig/x86/x86_64/CONFIG_EXTCON_MAX3355)0
-rw-r--r--baseconfig/x86/CONFIG_EXTCON_RT8973A (renamed from baseconfig/x86/x86_64/CONFIG_EXTCON_RT8973A)0
-rw-r--r--baseconfig/x86/CONFIG_EXTCON_SM5502 (renamed from baseconfig/x86/x86_64/CONFIG_EXTCON_SM5502)0
-rw-r--r--baseconfig/x86/CONFIG_EXTCON_USB_GPIO (renamed from baseconfig/x86/x86_64/CONFIG_EXTCON_USB_GPIO)0
-rw-r--r--baseconfig/x86/x86_64/CONFIG_EXTCON1
8 files changed, 2 insertions, 1 deletions
diff --git a/baseconfig/x86/CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH b/baseconfig/x86/CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH
new file mode 100644
index 000000000..4b0b2944d
--- /dev/null
+++ b/baseconfig/x86/CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH
@@ -0,0 +1 @@
+# CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH is not set
diff --git a/baseconfig/x86/CONFIG_EXTCON b/baseconfig/x86/CONFIG_EXTCON
new file mode 100644
index 000000000..bde29bcfc
--- /dev/null
+++ b/baseconfig/x86/CONFIG_EXTCON
@@ -0,0 +1 @@
+CONFIG_EXTCON=y
diff --git a/baseconfig/x86/x86_64/CONFIG_EXTCON_GPIO b/baseconfig/x86/CONFIG_EXTCON_GPIO
index 87ca2bd05..87ca2bd05 100644
--- a/baseconfig/x86/x86_64/CONFIG_EXTCON_GPIO
+++ b/baseconfig/x86/CONFIG_EXTCON_GPIO
diff --git a/baseconfig/x86/x86_64/CONFIG_EXTCON_MAX3355 b/baseconfig/x86/CONFIG_EXTCON_MAX3355
index 680b5a774..680b5a774 100644
--- a/baseconfig/x86/x86_64/CONFIG_EXTCON_MAX3355
+++ b/baseconfig/x86/CONFIG_EXTCON_MAX3355
diff --git a/baseconfig/x86/x86_64/CONFIG_EXTCON_RT8973A b/baseconfig/x86/CONFIG_EXTCON_RT8973A
index e5f7236c9..e5f7236c9 100644
--- a/baseconfig/x86/x86_64/CONFIG_EXTCON_RT8973A
+++ b/baseconfig/x86/CONFIG_EXTCON_RT8973A
diff --git a/baseconfig/x86/x86_64/CONFIG_EXTCON_SM5502 b/baseconfig/x86/CONFIG_EXTCON_SM5502
index 916994aa9..916994aa9 100644
--- a/baseconfig/x86/x86_64/CONFIG_EXTCON_SM5502
+++ b/baseconfig/x86/CONFIG_EXTCON_SM5502
diff --git a/baseconfig/x86/x86_64/CONFIG_EXTCON_USB_GPIO b/baseconfig/x86/CONFIG_EXTCON_USB_GPIO
index 7a0c9af30..7a0c9af30 100644
--- a/baseconfig/x86/x86_64/CONFIG_EXTCON_USB_GPIO
+++ b/baseconfig/x86/CONFIG_EXTCON_USB_GPIO
diff --git a/baseconfig/x86/x86_64/CONFIG_EXTCON b/baseconfig/x86/x86_64/CONFIG_EXTCON
deleted file mode 100644
index 0a7190c08..000000000
--- a/baseconfig/x86/x86_64/CONFIG_EXTCON
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EXTCON=m