1 files changed, 7 insertions, 23 deletions
diff --git a/arch/arm/mach-msm/scm-boot.h b/arch/arm/mach-msm/scm-boot.h
index 68f9b6153d74..7be32ff5d687 100644
--- a/arch/arm/mach-msm/scm-boot.h
+++ b/arch/arm/mach-msm/scm-boot.h
@@ -1,29 +1,13 @@
 /* Copyright (c) 2010, Code Aurora Forum. All rights reserved.
 *
- * Redistribution and use in source and binary forms, with or without
+ * This program is free software; you can redistribute it and/or modify
- * modification, are permitted provided that the following conditions are
+ * it under the terms of the GNU General Public License version 2 and
- * met:
+ * only version 2 as published by the Free Software Foundation.
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials provided
- *       with the distribution.
- *     * Neither the name of Code Aurora Forum, Inc. nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
 *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ * This program is distributed in the hope that it will be useful,
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ * GNU General Public License for more details.
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #ifndef __MACH_SCM_BOOT_H
 #define __MACH_SCM_BOOT_H

diff --git a/arch/arm/mach-msm/scm-boot.h b/arch/arm/mach-msm/scm-boot.h index 68f9b6153d74..7be32ff5d687 100644 --- a/arch/arm/mach-msm/scm-boot.h +++ b/arch/arm/mach-msm/scm-boot.h
@@ -1,29 +1,13 @@
1	/* Copyright (c) 2010, Code Aurora Forum. All rights reserved.	1	/* Copyright (c) 2010, Code Aurora Forum. All rights reserved.
2	*	2	*
3	* Redistribution and use in source and binary forms, with or without	3	* This program is free software; you can redistribute it and/or modify
4	* modification, are permitted provided that the following conditions are	4	* it under the terms of the GNU General Public License version 2 and
5	* met:	5	* only version 2 as published by the Free Software Foundation.
6	* * Redistributions of source code must retain the above copyright
7	* notice, this list of conditions and the following disclaimer.
8	* * Redistributions in binary form must reproduce the above
9	* copyright notice, this list of conditions and the following
10	* disclaimer in the documentation and/or other materials provided
11	* with the distribution.
12	* * Neither the name of Code Aurora Forum, Inc. nor the names of its
13	* contributors may be used to endorse or promote products derived
14	* from this software without specific prior written permission.
15	*	6	*
16	* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED	7	* This program is distributed in the hope that it will be useful,
17	* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF	8	* but WITHOUT ANY WARRANTY; without even the implied warranty of
18	* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT	9	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19	* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS	10	* GNU General Public License for more details.
20	* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
21	* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
22	* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
23	* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
24	* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
25	* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
26	* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27	*/	11	*/
28	#ifndef __MACH_SCM_BOOT_H	12	#ifndef __MACH_SCM_BOOT_H
29	#define __MACH_SCM_BOOT_H	13	#define __MACH_SCM_BOOT_H