21 files changed, 15 insertions, 13 deletions
diff --git a/baseconfig/s390x/CONFIG_ASYMMETRIC_KEY_TYPE b/baseconfig/s390x/CONFIG_ASYMMETRIC_KEY_TYPE
index f0f04df4c..c7d15a4b1 100644
--- a/baseconfig/s390x/CONFIG_ASYMMETRIC_KEY_TYPE
+++ b/baseconfig/s390x/CONFIG_ASYMMETRIC_KEY_TYPE
@@ -1 +1 @@
-# CONFIG_ASYMMETRIC_KEY_TYPE is not set
+CONFIG_ASYMMETRIC_KEY_TYPE=y
diff --git a/baseconfig/s390x/CONFIG_CRC7 b/baseconfig/s390x/CONFIG_CRC7
new file mode 100644
index 000000000..51fff909f
--- /dev/null
+++ b/baseconfig/s390x/CONFIG_CRC7
@@ -0,0 +1 @@
+# CONFIG_CRC7 is not set
diff --git a/baseconfig/s390x/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND b/baseconfig/s390x/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND
new file mode 100644
index 000000000..ca7663b83
--- /dev/null
+++ b/baseconfig/s390x/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND
@@ -0,0 +1 @@
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
diff --git a/baseconfig/s390x/CONFIG_FIXED_PHY b/baseconfig/s390x/CONFIG_FIXED_PHY
new file mode 100644
index 000000000..89309ed1e
--- /dev/null
+++ b/baseconfig/s390x/CONFIG_FIXED_PHY
@@ -0,0 +1 @@
+CONFIG_FIXED_PHY=m
diff --git a/baseconfig/s390x/CONFIG_HID b/baseconfig/s390x/CONFIG_HID
index befe82811..15d84482e 100644
--- a/baseconfig/s390x/CONFIG_HID
+++ b/baseconfig/s390x/CONFIG_HID
@@ -1 +1 @@
-# CONFIG_HID is not set
+CONFIG_HID=m
diff --git a/baseconfig/s390x/CONFIG_HID_GENERIC b/baseconfig/s390x/CONFIG_HID_GENERIC
new file mode 100644
index 000000000..a281e1c08
--- /dev/null
+++ b/baseconfig/s390x/CONFIG_HID_GENERIC
@@ -0,0 +1 @@
+CONFIG_HID_GENERIC=m
diff --git a/baseconfig/s390x/CONFIG_HID_MAGICMOUSE b/baseconfig/s390x/CONFIG_HID_MAGICMOUSE
new file mode 100644
index 000000000..60e3719f1
--- /dev/null
+++ b/baseconfig/s390x/CONFIG_HID_MAGICMOUSE
@@ -0,0 +1 @@
+CONFIG_HID_MAGICMOUSE=m
diff --git a/baseconfig/s390x/CONFIG_HWMON b/baseconfig/s390x/CONFIG_HWMON
index 65c3ac9f5..d67f2b72f 100644
--- a/baseconfig/s390x/CONFIG_HWMON
+++ b/baseconfig/s390x/CONFIG_HWMON
@@ -1 +1 @@
-# CONFIG_HWMON is not set
+CONFIG_HWMON=m
diff --git a/baseconfig/s390x/CONFIG_I2C b/baseconfig/s390x/CONFIG_I2C
index 2ece0e7d3..063fe8213 100644
--- a/baseconfig/s390x/CONFIG_I2C
+++ b/baseconfig/s390x/CONFIG_I2C
@@ -1 +1 @@
-# CONFIG_I2C is not set
+CONFIG_I2C=m
diff --git a/baseconfig/s390x/CONFIG_INPUT b/baseconfig/s390x/CONFIG_INPUT
deleted file mode 100644
index 1c3694e55..000000000
--- a/baseconfig/s390x/CONFIG_INPUT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INPUT is not set
diff --git a/baseconfig/s390x/CONFIG_IUCV b/baseconfig/s390x/CONFIG_IUCV
index 5e27fc0c6..2ee374ce1 100644
--- a/baseconfig/s390x/CONFIG_IUCV
+++ b/baseconfig/s390x/CONFIG_IUCV
@@ -1 +1 @@
-CONFIG_IUCV=m
+CONFIG_IUCV=y
diff --git a/baseconfig/s390x/CONFIG_MFD_CORE b/baseconfig/s390x/CONFIG_MFD_CORE
index 61d91aa6e..c8855e8a0 100644
--- a/baseconfig/s390x/CONFIG_MFD_CORE
+++ b/baseconfig/s390x/CONFIG_MFD_CORE
@@ -1 +1 @@
-# CONFIG_MFD_CORE is not set
+CONFIG_MFD_CORE=m
diff --git a/baseconfig/s390x/CONFIG_MFD_WL1273_CORE b/baseconfig/s390x/CONFIG_MFD_WL1273_CORE
new file mode 100644
index 000000000..cfdc6c17b
--- /dev/null
+++ b/baseconfig/s390x/CONFIG_MFD_WL1273_CORE
@@ -0,0 +1 @@
+# CONFIG_MFD_WL1273_CORE is not set
diff --git a/baseconfig/s390x/CONFIG_MII b/baseconfig/s390x/CONFIG_MII
deleted file mode 100644
index 13370a5d9..000000000
--- a/baseconfig/s390x/CONFIG_MII
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MII is not set
diff --git a/baseconfig/s390x/CONFIG_NEW_LEDS b/baseconfig/s390x/CONFIG_NEW_LEDS
deleted file mode 100644
index 3d1c33f73..000000000
--- a/baseconfig/s390x/CONFIG_NEW_LEDS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NEW_LEDS is not set
diff --git a/baseconfig/s390x/CONFIG_PCMCIA b/baseconfig/s390x/CONFIG_PCMCIA
new file mode 100644
index 000000000..3cf9bfbdc
--- /dev/null
+++ b/baseconfig/s390x/CONFIG_PCMCIA
@@ -0,0 +1 @@
+# CONFIG_PCMCIA is not set
diff --git a/baseconfig/s390x/CONFIG_PHYLIB b/baseconfig/s390x/CONFIG_PHYLIB
index 103783e75..9ecd6c079 100644
--- a/baseconfig/s390x/CONFIG_PHYLIB
+++ b/baseconfig/s390x/CONFIG_PHYLIB
@@ -1 +1 @@
-# CONFIG_PHYLIB is not set
+CONFIG_PHYLIB=m
diff --git a/baseconfig/s390x/CONFIG_POWER_SUPPLY b/baseconfig/s390x/CONFIG_POWER_SUPPLY
deleted file mode 100644
index 216bbeb57..000000000
--- a/baseconfig/s390x/CONFIG_POWER_SUPPLY
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_POWER_SUPPLY is not set
diff --git a/baseconfig/s390x/CONFIG_PPS b/baseconfig/s390x/CONFIG_PPS
deleted file mode 100644
index 60355a149..000000000
--- a/baseconfig/s390x/CONFIG_PPS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PPS is not set
diff --git a/baseconfig/s390x/CONFIG_PTP_1588_CLOCK b/baseconfig/s390x/CONFIG_PTP_1588_CLOCK
deleted file mode 100644
index cef2b3eda..000000000
--- a/baseconfig/s390x/CONFIG_PTP_1588_CLOCK
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PTP_1588_CLOCK is not set
diff --git a/baseconfig/s390x/CONFIG_SERIAL_CORE b/baseconfig/s390x/CONFIG_SERIAL_CORE
new file mode 100644
index 000000000..32ecde504
--- /dev/null
+++ b/baseconfig/s390x/CONFIG_SERIAL_CORE
@@ -0,0 +1 @@
+CONFIG_SERIAL_CORE=m