Correct company name in copyrights

Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>

45 files changed, 48 insertions, 47 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ca985e6ab9b..a69b02f4670 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -762,7 +762,7 @@ config ARCH_U8500
 	select ARCH_HAS_CPUFREQ
 	select NOMADIK_GPIO
 	help
-	  Support for ST-Ericsson's Ux500 architecture
+	  Include support for ST-Ericsson's Cortex-A9 Platform.
 
 config ARCH_NOMADIK
 	bool "STMicroelectronics Nomadik"
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index 3f40807e7ac..8e50c780f75 100755
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 ST Ericsson.
+ * Copyright (C) 2009 ST-Ericsson SA
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2, as
diff --git a/arch/arm/mach-ux500/clock.c b/arch/arm/mach-ux500/clock.c
index b4a959625f6..b4601109ebc 100755
--- a/arch/arm/mach-ux500/clock.c
+++ b/arch/arm/mach-ux500/clock.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2009 ST-Ericsson
+ *  Copyright (C) 2009 ST-Ericsson SA
  *  Copyright (C) 2009 STMicroelectronics
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/arch/arm/mach-ux500/clock.h b/arch/arm/mach-ux500/clock.h
index fb8534c4972..82dbf44b029 100755
--- a/arch/arm/mach-ux500/clock.h
+++ b/arch/arm/mach-ux500/clock.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2010 ST-Ericsson
+ *  Copyright (C) 2010 ST-Ericsson SA
  *  Copyright (C) 2009 STMicrolectronics
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/arch/arm/mach-ux500/cpufreq.c b/arch/arm/mach-ux500/cpufreq.c
index 5376032e907..d41e2796613 100755
--- a/arch/arm/mach-ux500/cpufreq.c
+++ b/arch/arm/mach-ux500/cpufreq.c
@@ -1,8 +1,8 @@
 /*
  * CPU frequency module for U8500
  *
- * Copyright 2009 STMicroelectronics.
- * Copyright 2009 ST-Ericsson
+ * Copyright (C) 2009 STMicroelectronics.
+ * Copyright (C) 2009 ST-Ericsson SA
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2
diff --git a/arch/arm/mach-ux500/cpuidle.c b/arch/arm/mach-ux500/cpuidle.c
index 98409ea1c43..b5a7c1a25e6 100755
--- a/arch/arm/mach-ux500/cpuidle.c
+++ b/arch/arm/mach-ux500/cpuidle.c
@@ -1,8 +1,8 @@
 /*
  * CPU idle module for U8500
  *
- * Copyright 2009 STMicroelectronics.
- * Copyright 2009 ST-Ericsson.
+ * Copyright (C) 2009 STMicroelectronics.
+ * Copyright (C) 2009 ST-Ericsson SA
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2
diff --git a/arch/arm/mach-ux500/devices.c b/arch/arm/mach-ux500/devices.c
index bba25532cd8..0628e8fba6b 100755
--- a/arch/arm/mach-ux500/devices.c
+++ b/arch/arm/mach-ux500/devices.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 ST Ericsson.
+ * Copyright (C) 2009 ST-Ericsson SA
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2, as
diff --git a/arch/arm/mach-ux500/headsmp.S b/arch/arm/mach-ux500/headsmp.S
index 1f9aee4675d..a7e5556f10a 100755
--- a/arch/arm/mach-ux500/headsmp.S
+++ b/arch/arm/mach-ux500/headsmp.S
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) ST Ericsson
+ *  Copyright (c) ST-Ericsson SA
  *	based on ARM realview platform
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/arch/arm/mach-ux500/include/mach/ab8500-dev.h b/arch/arm/mach-ux500/include/mach/ab8500-dev.h
index 8b4d69f5d2e..6e1fba10275 100755
--- a/arch/arm/mach-ux500/include/mach/ab8500-dev.h
+++ b/arch/arm/mach-ux500/include/mach/ab8500-dev.h
@@ -1,7 +1,7 @@
 /*
  * ab8500-dev.c - simple userspace interface to ab8500
  *
- * Copyright (C) 2009 STEricsson
+ * Copyright (C) 2009 ST-Ericsson SA
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2
diff --git a/arch/arm/mach-ux500/include/mach/ab8500.h b/arch/arm/mach-ux500/include/mach/ab8500.h
index 25778e85957..29c1a395185 100755
--- a/arch/arm/mach-ux500/include/mach/ab8500.h
+++ b/arch/arm/mach-ux500/include/mach/ab8500.h
@@ -1,5 +1,5 @@
 /*
- * Copyright ST-Ericsson 2009.
+ * Copyright (C) ST-Ericsson 2009.
  *
  * Author: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
  * Licensed under GPLv2.
diff --git a/arch/arm/mach-ux500/include/mach/ab8500_gpadc.h b/arch/arm/mach-ux500/include/mach/ab8500_gpadc.h
index 150ff10173e..c5c4ad22a31 100644
--- a/arch/arm/mach-ux500/include/mach/ab8500_gpadc.h
+++ b/arch/arm/mach-ux500/include/mach/ab8500_gpadc.h
@@ -1,7 +1,7 @@
 /*
  * ab8500_gpadc.c - AB8500 GPADC Driver
  *
- * Copyright (C) 2010 ST-Ericsson
+ * Copyright (C) 2010 ST-Ericsson SA
  * Licensed under GPLv2.
  *
  * Author: Arun R Murthy <arun.murthy@stericsson.com>
diff --git a/arch/arm/mach-ux500/include/mach/bit_mask.h b/arch/arm/mach-ux500/include/mach/bit_mask.h
index 9487dff5242..6fe44cc6f0c 100755
--- a/arch/arm/mach-ux500/include/mach/bit_mask.h
+++ b/arch/arm/mach-ux500/include/mach/bit_mask.h
@@ -1,5 +1,5 @@
 /*---------------------------------------------------------------------------*/
-/* Copyright (C) STEricsson 2009. 					    */
+/* Copyright (C) ST-Ericsson 2009. 					    */
 /*                                                                           */
 /* This program is free software; you can redistribute it and/or modify it   */
 /* under the terms of the GNU Lesser General Public License as published     */
diff --git a/arch/arm/mach-ux500/include/mach/debug-macro.S b/arch/arm/mach-ux500/include/mach/debug-macro.S
index 5075a453223..c08ef5fc114 100755
--- a/arch/arm/mach-ux500/include/mach/debug-macro.S
+++ b/arch/arm/mach-ux500/include/mach/debug-macro.S
@@ -1,7 +1,7 @@
 /*
  * Debugging macro include header
  *
- *  Copyright (C) 2009 ST-Ericsson
+ *  Copyright (C) 2009 ST-Ericsson SA
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/arch/arm/mach-ux500/include/mach/dma.h b/arch/arm/mach-ux500/include/mach/dma.h
index 269dd4c8108..69c6f4c2216 100755
--- a/arch/arm/mach-ux500/include/mach/dma.h
+++ b/arch/arm/mach-ux500/include/mach/dma.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ST-Ericsson.
+ * Copyright 2009 ST-Ericsson SA
  * Copyright 2009 STMicroelectronics.
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/arch/arm/mach-ux500/include/mach/gpio.h b/arch/arm/mach-ux500/include/mach/gpio.h
index 00ff25b631a..7a97ac14986 100755
--- a/arch/arm/mach-ux500/include/mach/gpio.h
+++ b/arch/arm/mach-ux500/include/mach/gpio.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright (C) 2007 ST Microelectronics
- *  Copyright (C) 2010 ST-Ericsson
+ *  Copyright (C) 2010 ST-Ericsson SA
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/arch/arm/mach-ux500/include/mach/hardware.h b/arch/arm/mach-ux500/include/mach/hardware.h
index fd5c897b1f1..308e3096f7f 100755
--- a/arch/arm/mach-ux500/include/mach/hardware.h
+++ b/arch/arm/mach-ux500/include/mach/hardware.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 ST-Ericsson.
+ * Copyright (C) 2009 ST-Ericsson SA
  *
  * U8500 hardware definitions
  *
diff --git a/arch/arm/mach-ux500/include/mach/hcl_defs.h b/arch/arm/mach-ux500/include/mach/hcl_defs.h
index ce8ac33618f..efd37608cb3 100755
--- a/arch/arm/mach-ux500/include/mach/hcl_defs.h
+++ b/arch/arm/mach-ux500/include/mach/hcl_defs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 ST Ericsson.
+ * Copyright (C) 2009 ST-Ericsson SA
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/arch/arm/mach-ux500/include/mach/irqs.h b/arch/arm/mach-ux500/include/mach/irqs.h
index cfd18d0a9b3..20c32392fba 100755
--- a/arch/arm/mach-ux500/include/mach/irqs.h
+++ b/arch/arm/mach-ux500/include/mach/irqs.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright (C) 2008 ST Microelectronics
- *  Copyright (C) 2009 ST-Ericsson.
+ *  Copyright (C) 2009 ST-Ericsson SA
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/arch/arm/mach-ux500/include/mach/kpd.h b/arch/arm/mach-ux500/include/mach/kpd.h
index eae65ea7f94..b1014a1a3ad 100755
--- a/arch/arm/mach-ux500/include/mach/kpd.h
+++ b/arch/arm/mach-ux500/include/mach/kpd.h
@@ -1,6 +1,6 @@
 /*
  * Copyright STMicroelectronics, 2009.
- * Copyright (C) 2009 ST-Ericsson.
+ * Copyright (C) 2009 ST-Ericsson SA
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/arch/arm/mach-ux500/include/mach/memory.h b/arch/arm/mach-ux500/include/mach/memory.h
index 8a9d1324dec..55ca59ec2a9 100755
--- a/arch/arm/mach-ux500/include/mach/memory.h
+++ b/arch/arm/mach-ux500/include/mach/memory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 ST-Ericsson
+ * Copyright (C) 2009 ST-Ericsson SA
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/arch/arm/mach-ux500/include/mach/mmc.h b/arch/arm/mach-ux500/include/mach/mmc.h
index b2f3f920aa1..068ce8ae3cd 100755
--- a/arch/arm/mach-ux500/include/mach/mmc.h
+++ b/arch/arm/mach-ux500/include/mach/mmc.h
@@ -2,7 +2,7 @@
  * Overview:
  *  	 SD/EMMC driver for u8500 platform
  *
- * Copyright (C) 2009 ST Ericsson.
+ * Copyright (C) 2009 ST-Ericsson SA
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/arch/arm/mach-ux500/include/mach/mtu.h b/arch/arm/mach-ux500/include/mach/mtu.h
index d3725fec7de..d778c24e3e3 100755
--- a/arch/arm/mach-ux500/include/mach/mtu.h
+++ b/arch/arm/mach-ux500/include/mach/mtu.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 ST-Ericsson
+ * Copyright (C) 2009 ST-Ericsson SA
  * MultiTimerUnit register definitions, copied from Nomadik 8815
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/arch/arm/mach-ux500/include/mach/prcmu-fw-api.h b/arch/arm/mach-ux500/include/mach/prcmu-fw-api.h
index 504f8c506ae..afb1e2cc8c1 100755
--- a/arch/arm/mach-ux500/include/mach/prcmu-fw-api.h
+++ b/arch/arm/mach-ux500/include/mach/prcmu-fw-api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 ST-Ericsson
+ * Copyright (c) 2009 ST-Ericsson SA
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2
diff --git a/arch/arm/mach-ux500/include/mach/prcmu-fw-defs_ed.h b/arch/arm/mach-ux500/include/mach/prcmu-fw-defs_ed.h
index 849bacf0f8f..5f9c5aa7a8e 100755
--- a/arch/arm/mach-ux500/include/mach/prcmu-fw-defs_ed.h
+++ b/arch/arm/mach-ux500/include/mach/prcmu-fw-defs_ed.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 ST-Ericsson
+ * Copyright (c) 2009 ST-Ericsson SA
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2
diff --git a/arch/arm/mach-ux500/include/mach/prcmu-fw-defs_v1.h b/arch/arm/mach-ux500/include/mach/prcmu-fw-defs_v1.h
index fffe22a553a..6927b405eee 100755
--- a/arch/arm/mach-ux500/include/mach/prcmu-fw-defs_v1.h
+++ b/arch/arm/mach-ux500/include/mach/prcmu-fw-defs_v1.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 ST-Ericsson
+ * Copyright (c) 2009 ST-Ericsson SA
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2
diff --git a/arch/arm/mach-ux500/include/mach/prcmu-regs.h b/arch/arm/mach-ux500/include/mach/prcmu-regs.h
index c2c8d503553..1b1c2287b63 100755
--- a/arch/arm/mach-ux500/include/mach/prcmu-regs.h
+++ b/arch/arm/mach-ux500/include/mach/prcmu-regs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 ST-Ericsson
+ * Copyright (c) 2009 ST-Ericsson SA
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2
diff --git a/arch/arm/mach-ux500/include/mach/scu.h b/arch/arm/mach-ux500/include/mach/scu.h
index 492c98c4810..a09e86a9d3c 100755
--- a/arch/arm/mach-ux500/include/mach/scu.h
+++ b/arch/arm/mach-ux500/include/mach/scu.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 ST Ericsson.
+ * Copyright (C) 2009 ST-Ericsson SA
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/arch/arm/mach-ux500/include/mach/smp.h b/arch/arm/mach-ux500/include/mach/smp.h
index 3c1ec85c7dc..66bea66f309 100755
--- a/arch/arm/mach-ux500/include/mach/smp.h
+++ b/arch/arm/mach-ux500/include/mach/smp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 ST Ericsson.
+ * Copyright (C) 2009 ST-Ericsson SA
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/arch/arm/mach-ux500/include/mach/stmpe1601.h b/arch/arm/mach-ux500/include/mach/stmpe1601.h
index c676f00b343..693ba0121a3 100755
--- a/arch/arm/mach-ux500/include/mach/stmpe1601.h
+++ b/arch/arm/mach-ux500/include/mach/stmpe1601.h
@@ -2,7 +2,7 @@
  * Overview:
  *  	 stmpe1601 gpio port expander register definitions
  *
- * Copyright (C) 2009 ST Ericsson.
+ * Copyright (C) 2009 ST-Ericsson SA
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/arch/arm/mach-ux500/include/mach/stmpe2401.h b/arch/arm/mach-ux500/include/mach/stmpe2401.h
index 2a5765d4596..b1840b918f4 100755
--- a/arch/arm/mach-ux500/include/mach/stmpe2401.h
+++ b/arch/arm/mach-ux500/include/mach/stmpe2401.h
@@ -2,7 +2,7 @@
  * Overview:
  *  	 stmpe2401 gpio port expander register definitions
  *
- * Copyright (C) 2009 ST Ericsson.
+ * Copyright (C) 2009 ST-Ericsson SA
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/arch/arm/mach-ux500/include/mach/system.h b/arch/arm/mach-ux500/include/mach/system.h
index dd2e7277d93..b46c618c7be 100755
--- a/arch/arm/mach-ux500/include/mach/system.h
+++ b/arch/arm/mach-ux500/include/mach/system.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 ST Ericsson.
+ * Copyright (C) 2009 ST-Ericsson SA
  *
  * This file is licensed under  the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
diff --git a/arch/arm/mach-ux500/include/mach/tc35892.h b/arch/arm/mach-ux500/include/mach/tc35892.h
index 894274c33de..c6e784745c0 100755
--- a/arch/arm/mach-ux500/include/mach/tc35892.h
+++ b/arch/arm/mach-ux500/include/mach/tc35892.h
@@ -2,7 +2,7 @@
  * Overview:
  *  	 tc35892 gpio port expander register definitions
  *
- * Copyright (C) 2009 ST Ericsson.
+ * Copyright (C) 2009 ST-Ericsson SA
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/arch/arm/mach-ux500/include/mach/u8500_tsc.h b/arch/arm/mach-ux500/include/mach/u8500_tsc.h
index 0331d1eb254..8cbbcb2e4a0 100755
--- a/arch/arm/mach-ux500/include/mach/u8500_tsc.h
+++ b/arch/arm/mach-ux500/include/mach/u8500_tsc.h
@@ -2,7 +2,7 @@
  * Overview:
  *  	 Touch panel register definitions
  *
- * Copyright (C) 2009 ST Ericsson
+ * Copyright (C) 2009 ST-Ericsson SA
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/arch/arm/mach-ux500/include/mach/uart.h b/arch/arm/mach-ux500/include/mach/uart.h
index a2dc5715bfe..22feb1f84da 100755
--- a/arch/arm/mach-ux500/include/mach/uart.h
+++ b/arch/arm/mach-ux500/include/mach/uart.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 ST-Ericsson.
+ * Copyright (C) 2009 ST-Ericsson SA
  *
  * This file is licensed under  the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
diff --git a/arch/arm/mach-ux500/include/mach/uncompress.h b/arch/arm/mach-ux500/include/mach/uncompress.h
index b2c9a5b3d97..3499163eb40 100755
--- a/arch/arm/mach-ux500/include/mach/uncompress.h
+++ b/arch/arm/mach-ux500/include/mach/uncompress.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2009 ST Ericsson
+ *  Copyright (C) 2009 ST-Ericsson SA
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/arch/arm/mach-ux500/include/mach/vmalloc.h b/arch/arm/mach-ux500/include/mach/vmalloc.h
index 86cdbbce184..d9b8491555b 100755
--- a/arch/arm/mach-ux500/include/mach/vmalloc.h
+++ b/arch/arm/mach-ux500/include/mach/vmalloc.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2009 ST-Ericsson
+ *  Copyright (C) 2009 ST-Ericsson SA
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/arch/arm/mach-ux500/localtimer.c b/arch/arm/mach-ux500/localtimer.c
index b59e14697ca..dee1267b7e3 100755
--- a/arch/arm/mach-ux500/localtimer.c
+++ b/arch/arm/mach-ux500/localtimer.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2009 ST Ericsson.
+ *  Copyright (C) 2009 ST-Ericsson SA
  *	This file is based on realview platform
  *  Copyright (C) 2002 ARM Ltd.
  *
diff --git a/arch/arm/mach-ux500/platsmp.c b/arch/arm/mach-ux500/platsmp.c
index 8349b0c87c8..11303285b17 100755
--- a/arch/arm/mach-ux500/platsmp.c
+++ b/arch/arm/mach-ux500/platsmp.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2009 ST Ericsson.
+ *  Copyright (C) 2009 ST-Ericsson SA
  * 	this file is heavily based on ARM realview platform
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/arch/arm/mach-ux500/pm.c b/arch/arm/mach-ux500/pm.c
index f753ef11eea..ef2aefa51ea 100755
--- a/arch/arm/mach-ux500/pm.c
+++ b/arch/arm/mach-ux500/pm.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 2009 STMicroelectronics.
+ * Copyright (C) 2009 ST-Ericsson SA
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2
diff --git a/arch/arm/mach-ux500/prcmu-fw.c b/arch/arm/mach-ux500/prcmu-fw.c
index 0ce99336910..fc93dfc9ced 100755
--- a/arch/arm/mach-ux500/prcmu-fw.c
+++ b/arch/arm/mach-ux500/prcmu-fw.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ST-Ericsson.
+ * Copyright (C) 2009 ST-Ericsson SA
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2
diff --git a/arch/arm/mach-ux500/prcmu-fw_ed.h b/arch/arm/mach-ux500/prcmu-fw_ed.h
index 1a1f8d8fc6b..7a2d2de436c 100755
--- a/arch/arm/mach-ux500/prcmu-fw_ed.h
+++ b/arch/arm/mach-ux500/prcmu-fw_ed.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 ST-Ericsson
+ * Copyright (c) 2009 ST-Ericsson SA
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2
diff --git a/arch/arm/mach-ux500/prcmu-fw_v1.h b/arch/arm/mach-ux500/prcmu-fw_v1.h
index dfb95cc4b55..fcdecfb7a69 100755
--- a/arch/arm/mach-ux500/prcmu-fw_v1.h
+++ b/arch/arm/mach-ux500/prcmu-fw_v1.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ST-Ericsson.
+ * Copyright (C) 2009 ST-Ericsson SA
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2
diff --git a/arch/arm/mach-ux500/regulator.c b/arch/arm/mach-ux500/regulator.c
index 085af6138c8..50dedcfdcc5 100644
--- a/arch/arm/mach-ux500/regulator.c
+++ b/arch/arm/mach-ux500/regulator.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 ST Ericsson.
+ * Copyright (C) 2009 ST-Ericsson SA
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2, as
@@ -297,7 +297,7 @@ static void __exit db8500_regulator_exit(void)
 arch_initcall(db8500_regulator_init);
 module_exit(db8500_regulator_exit);
 
-MODULE_AUTHOR("STMicroelectronics/STEricsson");
+MODULE_AUTHOR("STMicroelectronics/ST-Ericsson");
 MODULE_DESCRIPTION("DB8500 voltage framework");
 MODULE_LICENSE("GPL");
 
diff --git a/arch/arm/mach-ux500/timer-rtt.c b/arch/arm/mach-ux500/timer-rtt.c
index 1b7f15a381c..cc6d83bc38a 100644
--- a/arch/arm/mach-ux500/timer-rtt.c
+++ b/arch/arm/mach-ux500/timer-rtt.c
@@ -1,7 +1,7 @@
 /*
  * linux/arch/arm/mach-u8500/timer-rtt.c
  *
- * Copyright (C) 2009 ST-Ericsson
+ * Copyright (C) 2009 ST-Ericsson SA
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2, as
diff --git a/arch/arm/mach-ux500/timer.c b/arch/arm/mach-ux500/timer.c
index bfe5545bfac..633ae9f93d9 100755
--- a/arch/arm/mach-ux500/timer.c
+++ b/arch/arm/mach-ux500/timer.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2008 STMicroelectronics
  * Copyright (C) 2009 Alessandro Rubini, somewhat based on at91sam926x
- * Copyright (C) 2009 ST Ericsson.
+ * Copyright (C) 2009 ST-Ericsson SA
  *	added support to u8500 platform, heavily based on 8815
  * 	Author: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
  *