On Wed, Jun 6, 2012 at 2:49 AM, Steven J. Hill <sjhill@xxxxxxxx> wrote: > From: "Steven J. Hill" <sjhill@xxxxxxxx> > > Make headers consistent across the files and make changes based on > running the checkpatch script. > > Signed-off-by: Steven J. Hill <sjhill@xxxxxxxx> > --- > arch/mips/netlogic/xlr/setup.c | 35 +++++------------------------------ > 1 file changed, 5 insertions(+), 30 deletions(-) > > diff --git a/arch/mips/netlogic/xlr/setup.c b/arch/mips/netlogic/xlr/setup.c > index 113a402..324c071 100644 > --- a/arch/mips/netlogic/xlr/setup.c > +++ b/arch/mips/netlogic/xlr/setup.c > @@ -1,37 +1,12 @@ > /* > + * This file is subject to the terms and conditions of the GNU General Public > + * License. See the file "COPYING" in the main directory of this archive > + * for more details. > + * > * Copyright 2003-2011 NetLogic Microsystems, Inc. (NetLogic). All rights > * reserved. > - * > - * This software is available to you under a choice of one of two > - * licenses. You may choose to be licensed under the terms of the GNU > - * General Public License (GPL) Version 2, available from the file > - * COPYING in the main directory of this source tree, or the NetLogic > - * license below: > - * [....] > - * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > + * Copyright (C) 2012 MIPS Technologies, Inc. All rights reserved. > */ Can you drop this? This patch changes the existing license on the file. Thanks, JC.
