diff options
author | Ben Dooks <ben@simtec.co.uk> | 2009-11-13 17:54:12 -0500 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2009-11-30 20:33:50 -0500 |
commit | 50f430e3ad22191744e61a4d6ff72af583a379c0 (patch) | |
tree | 61e695ebec676c0ce14b20f6f81ed2a92baff590 /arch | |
parent | 95eb56965cb85a5bd357540eaad4d3f722371b91 (diff) |
ARM: S3C: Fix Simtec copyright statements in Documentation/S3C24XX
The (c) alone is not a sufficient copyright statement, nor is it a
good replacement for the proper encircled © symbol [1]. Add the
word copyright to the apropriate places and remove the (c) symbol.
[1] http://www.copyrightservice.co.uk/copyright/p03_copyright_notices
section 4 'What does a notice consist of?'
Signed-off-by: Ben Dooks <ben@simtec.co.uk>
Signed-off-by: Simtec Linux Team <linux@simtec.co.uk>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-s3c2410/bast-irq.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/osiris-map.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/mach-bast.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/usb-simtec.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-s3c2440/mach-anubis.c | 4 | ||||
-rw-r--r-- | arch/arm/plat-s3c/clock.c | 4 | ||||
-rw-r--r-- | arch/arm/plat-s3c/include/plat/regs-serial.h | 2 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/dma.c | 4 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/pm-simtec.c | 4 |
9 files changed, 16 insertions, 16 deletions
diff --git a/arch/arm/mach-s3c2410/bast-irq.c b/arch/arm/mach-s3c2410/bast-irq.c index 9a37c87152b0..d5ab9adc738e 100644 --- a/arch/arm/mach-s3c2410/bast-irq.c +++ b/arch/arm/mach-s3c2410/bast-irq.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* linux/arch/arm/mach-s3c2410/bast-irq.c | 1 | /* linux/arch/arm/mach-s3c2410/bast-irq.c |
2 | * | 2 | * |
3 | * Copyright (c) 2003,2005 Simtec Electronics | 3 | * Copyright 2003,2005 Simtec Electronics |
4 | * Ben Dooks <ben@simtec.co.uk> | 4 | * Ben Dooks <ben@simtec.co.uk> |
5 | * | 5 | * |
6 | * http://www.simtec.co.uk/products/EB2410ITX/ | 6 | * http://www.simtec.co.uk/products/EB2410ITX/ |
@@ -141,7 +141,7 @@ static __init int bast_irq_init(void) | |||
141 | unsigned int i; | 141 | unsigned int i; |
142 | 142 | ||
143 | if (machine_is_bast()) { | 143 | if (machine_is_bast()) { |
144 | printk(KERN_INFO "BAST PC104 IRQ routing, (c) 2005 Simtec Electronics\n"); | 144 | printk(KERN_INFO "BAST PC104 IRQ routing, Copyright 2005 Simtec Electronics\n"); |
145 | 145 | ||
146 | /* zap all the IRQs */ | 146 | /* zap all the IRQs */ |
147 | 147 | ||
diff --git a/arch/arm/mach-s3c2410/include/mach/osiris-map.h b/arch/arm/mach-s3c2410/include/mach/osiris-map.h index 639eff523d4e..17380f848428 100644 --- a/arch/arm/mach-s3c2410/include/mach/osiris-map.h +++ b/arch/arm/mach-s3c2410/include/mach/osiris-map.h | |||
@@ -1,6 +1,6 @@ | |||
1 | /* arch/arm/mach-s3c2410/include/mach/osiris-map.h | 1 | /* arch/arm/mach-s3c2410/include/mach/osiris-map.h |
2 | * | 2 | * |
3 | * (c) 2005 Simtec Electronics | 3 | * Copyright 2005 Simtec Electronics |
4 | * http://www.simtec.co.uk/products/ | 4 | * http://www.simtec.co.uk/products/ |
5 | * Ben Dooks <ben@simtec.co.uk> | 5 | * Ben Dooks <ben@simtec.co.uk> |
6 | * | 6 | * |
diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c index 5f7837068238..9705d84233ce 100644 --- a/arch/arm/mach-s3c2410/mach-bast.c +++ b/arch/arm/mach-s3c2410/mach-bast.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* linux/arch/arm/mach-s3c2410/mach-bast.c | 1 | /* linux/arch/arm/mach-s3c2410/mach-bast.c |
2 | * | 2 | * |
3 | * Copyright (c) 2003-2005,2008 Simtec Electronics | 3 | * Copyright 2003-2005,2008 Simtec Electronics |
4 | * Ben Dooks <ben@simtec.co.uk> | 4 | * Ben Dooks <ben@simtec.co.uk> |
5 | * | 5 | * |
6 | * http://www.simtec.co.uk/products/EB2410ITX/ | 6 | * http://www.simtec.co.uk/products/EB2410ITX/ |
@@ -66,7 +66,7 @@ | |||
66 | #include "usb-simtec.h" | 66 | #include "usb-simtec.h" |
67 | #include "nor-simtec.h" | 67 | #include "nor-simtec.h" |
68 | 68 | ||
69 | #define COPYRIGHT ", (c) 2004-2005 Simtec Electronics" | 69 | #define COPYRIGHT ", Copyright 2004-2005 Simtec Electronics" |
70 | 70 | ||
71 | /* macros for virtual address mods for the io space entries */ | 71 | /* macros for virtual address mods for the io space entries */ |
72 | #define VA_C5(item) ((unsigned long)(item) + BAST_VAM_CS5) | 72 | #define VA_C5(item) ((unsigned long)(item) + BAST_VAM_CS5) |
diff --git a/arch/arm/mach-s3c2410/usb-simtec.c b/arch/arm/mach-s3c2410/usb-simtec.c index 50e25fc5f8ab..2b01f81b151b 100644 --- a/arch/arm/mach-s3c2410/usb-simtec.c +++ b/arch/arm/mach-s3c2410/usb-simtec.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* linux/arch/arm/mach-s3c2410/usb-simtec.c | 1 | /* linux/arch/arm/mach-s3c2410/usb-simtec.c |
2 | * | 2 | * |
3 | * Copyright (c) 2004,2005 Simtec Electronics | 3 | * Copyright 2004,2005 Simtec Electronics |
4 | * Ben Dooks <ben@simtec.co.uk> | 4 | * Ben Dooks <ben@simtec.co.uk> |
5 | * | 5 | * |
6 | * http://www.simtec.co.uk/products/EB2410ITX/ | 6 | * http://www.simtec.co.uk/products/EB2410ITX/ |
@@ -108,7 +108,7 @@ int usb_simtec_init(void) | |||
108 | { | 108 | { |
109 | int ret; | 109 | int ret; |
110 | 110 | ||
111 | printk("USB Power Control, (c) 2004 Simtec Electronics\n"); | 111 | printk("USB Power Control, Copyright 2004 Simtec Electronics\n"); |
112 | 112 | ||
113 | ret = gpio_request(S3C2410_GPB(4), "USB power control"); | 113 | ret = gpio_request(S3C2410_GPB(4), "USB power control"); |
114 | if (ret < 0) { | 114 | if (ret < 0) { |
diff --git a/arch/arm/mach-s3c2440/mach-anubis.c b/arch/arm/mach-s3c2440/mach-anubis.c index b8b9a428d497..c3705b99d15c 100644 --- a/arch/arm/mach-s3c2440/mach-anubis.c +++ b/arch/arm/mach-s3c2440/mach-anubis.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* linux/arch/arm/mach-s3c2440/mach-anubis.c | 1 | /* linux/arch/arm/mach-s3c2440/mach-anubis.c |
2 | * | 2 | * |
3 | * Copyright (c) 2003-2005,2008 Simtec Electronics | 3 | * Copyright 2003-2009 Simtec Electronics |
4 | * http://armlinux.simtec.co.uk/ | 4 | * http://armlinux.simtec.co.uk/ |
5 | * Ben Dooks <ben@simtec.co.uk> | 5 | * Ben Dooks <ben@simtec.co.uk> |
6 | * | 6 | * |
@@ -55,7 +55,7 @@ | |||
55 | #include <plat/cpu.h> | 55 | #include <plat/cpu.h> |
56 | #include <plat/audio-simtec.h> | 56 | #include <plat/audio-simtec.h> |
57 | 57 | ||
58 | #define COPYRIGHT ", (c) 2005-2009 Simtec Electronics" | 58 | #define COPYRIGHT ", Copyright 2005-2009 Simtec Electronics" |
59 | 59 | ||
60 | static struct map_desc anubis_iodesc[] __initdata = { | 60 | static struct map_desc anubis_iodesc[] __initdata = { |
61 | /* ISA IO areas */ | 61 | /* ISA IO areas */ |
diff --git a/arch/arm/plat-s3c/clock.c b/arch/arm/plat-s3c/clock.c index 4d01ef1a25dd..619cfa82dcab 100644 --- a/arch/arm/plat-s3c/clock.c +++ b/arch/arm/plat-s3c/clock.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* linux/arch/arm/plat-s3c24xx/clock.c | 1 | /* linux/arch/arm/plat-s3c24xx/clock.c |
2 | * | 2 | * |
3 | * Copyright (c) 2004-2005 Simtec Electronics | 3 | * Copyright 2004-2005 Simtec Electronics |
4 | * Ben Dooks <ben@simtec.co.uk> | 4 | * Ben Dooks <ben@simtec.co.uk> |
5 | * | 5 | * |
6 | * S3C24XX Core clock control support | 6 | * S3C24XX Core clock control support |
@@ -337,7 +337,7 @@ int s3c24xx_register_clocks(struct clk **clks, int nr_clks) | |||
337 | 337 | ||
338 | int __init s3c24xx_register_baseclocks(unsigned long xtal) | 338 | int __init s3c24xx_register_baseclocks(unsigned long xtal) |
339 | { | 339 | { |
340 | printk(KERN_INFO "S3C24XX Clocks, (c) 2004 Simtec Electronics\n"); | 340 | printk(KERN_INFO "S3C24XX Clocks, Copyright 2004 Simtec Electronics\n"); |
341 | 341 | ||
342 | clk_xtal.rate = xtal; | 342 | clk_xtal.rate = xtal; |
343 | 343 | ||
diff --git a/arch/arm/plat-s3c/include/plat/regs-serial.h b/arch/arm/plat-s3c/include/plat/regs-serial.h index 66af75a5cdd1..85d8904e7f24 100644 --- a/arch/arm/plat-s3c/include/plat/regs-serial.h +++ b/arch/arm/plat-s3c/include/plat/regs-serial.h | |||
@@ -6,7 +6,7 @@ | |||
6 | * | 6 | * |
7 | * Copyright (C) 2002 Shane Nay (shane@minirl.com) | 7 | * Copyright (C) 2002 Shane Nay (shane@minirl.com) |
8 | * | 8 | * |
9 | * Additional defines, (c) 2003 Simtec Electronics (linux@simtec.co.uk) | 9 | * Additional defines, Copyright 2003 Simtec Electronics (linux@simtec.co.uk) |
10 | * | 10 | * |
11 | * Adapted from: | 11 | * Adapted from: |
12 | * | 12 | * |
diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c index f046f8c51084..8fff92e1e275 100644 --- a/arch/arm/plat-s3c24xx/dma.c +++ b/arch/arm/plat-s3c24xx/dma.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* linux/arch/arm/plat-s3c24xx/dma.c | 1 | /* linux/arch/arm/plat-s3c24xx/dma.c |
2 | * | 2 | * |
3 | * Copyright (c) 2003-2005,2006 Simtec Electronics | 3 | * Copyright 2003-2005,2006 Simtec Electronics |
4 | * Ben Dooks <ben@simtec.co.uk> | 4 | * Ben Dooks <ben@simtec.co.uk> |
5 | * | 5 | * |
6 | * S3C2410 DMA core | 6 | * S3C2410 DMA core |
@@ -1310,7 +1310,7 @@ int __init s3c24xx_dma_init(unsigned int channels, unsigned int irq, | |||
1310 | int channel; | 1310 | int channel; |
1311 | int ret; | 1311 | int ret; |
1312 | 1312 | ||
1313 | printk("S3C24XX DMA Driver, (c) 2003-2004,2006 Simtec Electronics\n"); | 1313 | printk("S3C24XX DMA Driver, Copyright 2003-2004,2006 Simtec Electronics\n"); |
1314 | 1314 | ||
1315 | dma_channels = channels; | 1315 | dma_channels = channels; |
1316 | 1316 | ||
diff --git a/arch/arm/plat-s3c24xx/pm-simtec.c b/arch/arm/plat-s3c24xx/pm-simtec.c index da0d3217d3e3..663b280d65da 100644 --- a/arch/arm/plat-s3c24xx/pm-simtec.c +++ b/arch/arm/plat-s3c24xx/pm-simtec.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* linux/arch/arm/plat-s3c24xx/pm-simtec.c | 1 | /* linux/arch/arm/plat-s3c24xx/pm-simtec.c |
2 | * | 2 | * |
3 | * Copyright (c) 2004 Simtec Electronics | 3 | * Copyright 2004 Simtec Electronics |
4 | * Ben Dooks <ben@simtec.co.uk> | 4 | * Ben Dooks <ben@simtec.co.uk> |
5 | * | 5 | * |
6 | * http://armlinux.simtec.co.uk/ | 6 | * http://armlinux.simtec.co.uk/ |
@@ -35,7 +35,7 @@ | |||
35 | 35 | ||
36 | #include <plat/pm.h> | 36 | #include <plat/pm.h> |
37 | 37 | ||
38 | #define COPYRIGHT ", (c) 2005 Simtec Electronics" | 38 | #define COPYRIGHT ", Copyright 2005 Simtec Electronics" |
39 | 39 | ||
40 | /* pm_simtec_init | 40 | /* pm_simtec_init |
41 | * | 41 | * |