Merge branches 'omap1-upstream' and 'omap2-upstream' into devel

[~andy/linux] / arch / s390 / defconfig

diff --git a/arch/s390/defconfig b/arch/s390/defconfig
index d518693b58901b0c9f0fe5b8edf0663a10b2fcfb..2aae23dba4bbc8b2a087c3a36b8145a7cdfb5656 100644 (file)
--- a/arch/s390/defconfig
+++ b/arch/s390/defconfig
@@ -512,6 +512,7 @@ CONFIG_S390_TAPE_34XX=m
 # CONFIG_VMCP is not set
 # CONFIG_MONREADER is not set
 CONFIG_MONWRITER=m
+CONFIG_S390_VMUR=m
 # CONFIG_POWER_SUPPLY is not set
 
 #