diff --git a/[refs] b/[refs]
index a6c01085bb4d..de9a23b28cf0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0edc8faa769095e98a5a5adc28db982f99f0d663
+refs/heads/master: 3ee49c8f123257c72b74f398ef99ac3348c493cc
diff --git a/trunk/arch/s390/defconfig b/trunk/arch/s390/defconfig
index 29c82c640a88..6cf8e26b3137 100644
--- a/trunk/arch/s390/defconfig
+++ b/trunk/arch/s390/defconfig
@@ -68,7 +68,7 @@ CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_CLS_ACT=y
 CONFIG_NET_ACT_POLICE=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_FIRMWARE_IN_KERNEL is not set
+CONFIG_DEVTMPFS=y
 CONFIG_BLK_DEV_LOOP=m
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_RAM=y