X-Git-Url: http://git.buserror.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=kernel%2Farch%2Fx86%2Fmisc.cc;h=a747fb881b3ce9f7ddc6f588aa447667889a937e;hb=63f843cb182bbf5e1612a75808e549752e4bfb61;hp=bb01a1622f2b0cabcdfa4ed0f5c5aaed87baea5c;hpb=7da27a216a7f4bb3331fe315cdbec69bfcf2c762;p=polintos%2Fscott%2Fpriv.git diff --git a/kernel/arch/x86/misc.cc b/kernel/arch/x86/misc.cc index bb01a16..a747fb8 100644 --- a/kernel/arch/x86/misc.cc +++ b/kernel/arch/x86/misc.cc @@ -7,18 +7,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