diff --git a/[refs] b/[refs] index 10b30e986ee6..ad6cfb0edb93 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b3c21e4919c8598c58faaa0a650dc398baddd993 +refs/heads/master: 46e7951f9431b5e6bfbeb3044fdb4b522f58101c diff --git a/trunk/arch/s390/Kconfig b/trunk/arch/s390/Kconfig index 70b7645ce745..5f5c29269fb1 100644 --- a/trunk/arch/s390/Kconfig +++ b/trunk/arch/s390/Kconfig @@ -384,7 +384,7 @@ config IPL choice prompt "IPL method generated into head.S" depends on IPL - default IPL_TAPE + default IPL_VM help Select "tape" if you want to IPL the image from a Tape.