X-Git-Url: http://git.buserror.net/cgi-bin/gitweb.cgi?p=polintos%2Fscott%2Fpriv.git;a=blobdiff_plain;f=kernel%2Farch%2Fx64%2Fmultiboot.cc;h=ed1cda78b87d19cc16caa060f3a47106f52c3e31;hp=b06651ee7ce3f69b5c0be43a12a096896c899069;hb=2e0cf58da9949572c6e334a07bba6774fdb749f9;hpb=166dbb2f95c17d80568102b9f063c472e30d706b diff --git a/kernel/arch/x64/multiboot.cc b/kernel/arch/x64/multiboot.cc index b06651e..ed1cda7 100644 --- a/kernel/arch/x64/multiboot.cc +++ b/kernel/arch/x64/multiboot.cc @@ -8,18 +8,10 @@ // the Software without restriction, including without limitation the rights to // use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies // of the Software, and to permit persons to whom the Software is furnished to do -// so, subject to the following conditions: +// so, subject to the following condition: // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. // // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS