diff options
-rw-r--r-- | MAINTAINERS | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/board-snapper9260.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/dma-m2p.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/gpio.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/simone.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/snappercl15.c | 4 | ||||
-rw-r--r-- | drivers/mtd/devices/sst25l.c | 4 | ||||
-rw-r--r-- | drivers/power/ds2782_battery.c | 4 | ||||
-rw-r--r-- | drivers/video/ep93xx-fb.c | 4 | ||||
-rw-r--r-- | sound/soc/ep93xx/ep93xx-i2s.c | 4 | ||||
-rw-r--r-- | sound/soc/ep93xx/ep93xx-pcm.c | 4 | ||||
-rw-r--r-- | sound/soc/ep93xx/snappercl15.c | 4 |
12 files changed, 20 insertions, 20 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index bbe49d8c22a..8552948a712 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -683,7 +683,7 @@ T: git git://git.infradead.org/users/cbou/linux-cns3xxx.git | |||
683 | 683 | ||
684 | ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE | 684 | ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE |
685 | M: Hartley Sweeten <hsweeten@visionengravers.com> | 685 | M: Hartley Sweeten <hsweeten@visionengravers.com> |
686 | M: Ryan Mallon <ryan@bluewatersys.com> | 686 | M: Ryan Mallon <rmallon@gmail.com> |
687 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | 687 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
688 | S: Maintained | 688 | S: Maintained |
689 | F: arch/arm/mach-ep93xx/ | 689 | F: arch/arm/mach-ep93xx/ |
diff --git a/arch/arm/mach-at91/board-snapper9260.c b/arch/arm/mach-at91/board-snapper9260.c index 3eb0a1153cc..6010ce16b3c 100644 --- a/arch/arm/mach-at91/board-snapper9260.c +++ b/arch/arm/mach-at91/board-snapper9260.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * Copyright (C) 2010 Bluewater System Ltd | 4 | * Copyright (C) 2010 Bluewater System Ltd |
5 | * | 5 | * |
6 | * Author: Andre Renaud <andre@bluewatersys.com> | 6 | * Author: Andre Renaud <andre@bluewatersys.com> |
7 | * Author: Ryan Mallon <ryan@bluewatersys.com> | 7 | * Author: Ryan Mallon |
8 | * | 8 | * |
9 | * This program is free software; you can redistribute it and/or modify | 9 | * This program is free software; you can redistribute it and/or modify |
10 | * it under the terms of the GNU General Public License as published by | 10 | * it under the terms of the GNU General Public License as published by |
diff --git a/arch/arm/mach-ep93xx/dma-m2p.c b/arch/arm/mach-ep93xx/dma-m2p.c index a696d354b1f..1e036dd68ca 100644 --- a/arch/arm/mach-ep93xx/dma-m2p.c +++ b/arch/arm/mach-ep93xx/dma-m2p.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * Copyright (C) 2006 Lennert Buytenhek <buytenh@wantstofly.org> | 5 | * Copyright (C) 2006 Lennert Buytenhek <buytenh@wantstofly.org> |
6 | * Copyright (C) 2006 Applied Data Systems | 6 | * Copyright (C) 2006 Applied Data Systems |
7 | * | 7 | * |
8 | * Copyright (C) 2009 Ryan Mallon <ryan@bluewatersys.com> | 8 | * Copyright (C) 2009 Ryan Mallon |
9 | * | 9 | * |
10 | * This program is free software; you can redistribute it and/or modify | 10 | * This program is free software; you can redistribute it and/or modify |
11 | * it under the terms of the GNU General Public License as published by | 11 | * it under the terms of the GNU General Public License as published by |
diff --git a/arch/arm/mach-ep93xx/gpio.c b/arch/arm/mach-ep93xx/gpio.c index 415dce37b88..1a0f8522534 100644 --- a/arch/arm/mach-ep93xx/gpio.c +++ b/arch/arm/mach-ep93xx/gpio.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * | 3 | * |
4 | * Generic EP93xx GPIO handling | 4 | * Generic EP93xx GPIO handling |
5 | * | 5 | * |
6 | * Copyright (c) 2008 Ryan Mallon <ryan@bluewatersys.com> | 6 | * Copyright (c) 2008 Ryan Mallon |
7 | * | 7 | * |
8 | * Based on code originally from: | 8 | * Based on code originally from: |
9 | * linux/arch/arm/mach-ep93xx/core.c | 9 | * linux/arch/arm/mach-ep93xx/core.c |
diff --git a/arch/arm/mach-ep93xx/simone.c b/arch/arm/mach-ep93xx/simone.c index d96dc1c5da2..8392e95d7ce 100644 --- a/arch/arm/mach-ep93xx/simone.c +++ b/arch/arm/mach-ep93xx/simone.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * arch/arm/mach-ep93xx/simone.c | 2 | * arch/arm/mach-ep93xx/simone.c |
3 | * Simplemachines Sim.One support. | 3 | * Simplemachines Sim.One support. |
4 | * | 4 | * |
5 | * Copyright (C) 2010 Ryan Mallon <ryan@bluewatersys.com> | 5 | * Copyright (C) 2010 Ryan Mallon |
6 | * | 6 | * |
7 | * Based on the 2.6.24.7 support: | 7 | * Based on the 2.6.24.7 support: |
8 | * Copyright (C) 2009 Simplemachines | 8 | * Copyright (C) 2009 Simplemachines |
@@ -65,7 +65,7 @@ static void __init simone_init_machine(void) | |||
65 | } | 65 | } |
66 | 66 | ||
67 | MACHINE_START(SIM_ONE, "Simplemachines Sim.One Board") | 67 | MACHINE_START(SIM_ONE, "Simplemachines Sim.One Board") |
68 | /* Maintainer: Ryan Mallon <ryan@bluewatersys.com> */ | 68 | /* Maintainer: Ryan Mallon */ |
69 | .boot_params = EP93XX_SDCE0_PHYS_BASE + 0x100, | 69 | .boot_params = EP93XX_SDCE0_PHYS_BASE + 0x100, |
70 | .map_io = ep93xx_map_io, | 70 | .map_io = ep93xx_map_io, |
71 | .init_irq = ep93xx_init_irq, | 71 | .init_irq = ep93xx_init_irq, |
diff --git a/arch/arm/mach-ep93xx/snappercl15.c b/arch/arm/mach-ep93xx/snappercl15.c index ac601fe2b44..2e9c614757e 100644 --- a/arch/arm/mach-ep93xx/snappercl15.c +++ b/arch/arm/mach-ep93xx/snappercl15.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * Bluewater Systems Snapper CL15 system module | 3 | * Bluewater Systems Snapper CL15 system module |
4 | * | 4 | * |
5 | * Copyright (C) 2009 Bluewater Systems Ltd | 5 | * Copyright (C) 2009 Bluewater Systems Ltd |
6 | * Author: Ryan Mallon <ryan@bluewatersys.com> | 6 | * Author: Ryan Mallon |
7 | * | 7 | * |
8 | * NAND code adapted from driver by: | 8 | * NAND code adapted from driver by: |
9 | * Andre Renaud <andre@bluewatersys.com> | 9 | * Andre Renaud <andre@bluewatersys.com> |
@@ -162,7 +162,7 @@ static void __init snappercl15_init_machine(void) | |||
162 | } | 162 | } |
163 | 163 | ||
164 | MACHINE_START(SNAPPER_CL15, "Bluewater Systems Snapper CL15") | 164 | MACHINE_START(SNAPPER_CL15, "Bluewater Systems Snapper CL15") |
165 | /* Maintainer: Ryan Mallon <ryan@bluewatersys.com> */ | 165 | /* Maintainer: Ryan Mallon */ |
166 | .boot_params = EP93XX_SDCE0_PHYS_BASE + 0x100, | 166 | .boot_params = EP93XX_SDCE0_PHYS_BASE + 0x100, |
167 | .map_io = ep93xx_map_io, | 167 | .map_io = ep93xx_map_io, |
168 | .init_irq = ep93xx_init_irq, | 168 | .init_irq = ep93xx_init_irq, |
diff --git a/drivers/mtd/devices/sst25l.c b/drivers/mtd/devices/sst25l.c index 1e2c430aaad..83e80c65d6e 100644 --- a/drivers/mtd/devices/sst25l.c +++ b/drivers/mtd/devices/sst25l.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * | 5 | * |
6 | * Copyright © 2009 Bluewater Systems Ltd | 6 | * Copyright © 2009 Bluewater Systems Ltd |
7 | * Author: Andre Renaud <andre@bluewatersys.com> | 7 | * Author: Andre Renaud <andre@bluewatersys.com> |
8 | * Author: Ryan Mallon <ryan@bluewatersys.com> | 8 | * Author: Ryan Mallon |
9 | * | 9 | * |
10 | * Based on m25p80.c | 10 | * Based on m25p80.c |
11 | * | 11 | * |
@@ -498,5 +498,5 @@ module_exit(sst25l_exit); | |||
498 | 498 | ||
499 | MODULE_DESCRIPTION("MTD SPI driver for SST25L Flash chips"); | 499 | MODULE_DESCRIPTION("MTD SPI driver for SST25L Flash chips"); |
500 | MODULE_AUTHOR("Andre Renaud <andre@bluewatersys.com>, " | 500 | MODULE_AUTHOR("Andre Renaud <andre@bluewatersys.com>, " |
501 | "Ryan Mallon <ryan@bluewatersys.com>"); | 501 | "Ryan Mallon"); |
502 | MODULE_LICENSE("GPL"); | 502 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/power/ds2782_battery.c b/drivers/power/ds2782_battery.c index 4d2dc4fa288..bfbce5de49d 100644 --- a/drivers/power/ds2782_battery.c +++ b/drivers/power/ds2782_battery.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * | 3 | * |
4 | * Copyright (C) 2009 Bluewater Systems Ltd | 4 | * Copyright (C) 2009 Bluewater Systems Ltd |
5 | * | 5 | * |
6 | * Author: Ryan Mallon <ryan@bluewatersys.com> | 6 | * Author: Ryan Mallon |
7 | * | 7 | * |
8 | * DS2786 added by Yulia Vilensky <vilensky@compulab.co.il> | 8 | * DS2786 added by Yulia Vilensky <vilensky@compulab.co.il> |
9 | * | 9 | * |
@@ -416,6 +416,6 @@ static void __exit ds278x_exit(void) | |||
416 | } | 416 | } |
417 | module_exit(ds278x_exit); | 417 | module_exit(ds278x_exit); |
418 | 418 | ||
419 | MODULE_AUTHOR("Ryan Mallon <ryan@bluewatersys.com>"); | 419 | MODULE_AUTHOR("Ryan Mallon"); |
420 | MODULE_DESCRIPTION("Maxim/Dallas DS2782 Stand-Alone Fuel Gauage IC driver"); | 420 | MODULE_DESCRIPTION("Maxim/Dallas DS2782 Stand-Alone Fuel Gauage IC driver"); |
421 | MODULE_LICENSE("GPL"); | 421 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/video/ep93xx-fb.c b/drivers/video/ep93xx-fb.c index cbdb1bd77c2..40e5f17d1e4 100644 --- a/drivers/video/ep93xx-fb.c +++ b/drivers/video/ep93xx-fb.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * Framebuffer support for the EP93xx series. | 4 | * Framebuffer support for the EP93xx series. |
5 | * | 5 | * |
6 | * Copyright (C) 2007 Bluewater Systems Ltd | 6 | * Copyright (C) 2007 Bluewater Systems Ltd |
7 | * Author: Ryan Mallon <ryan@bluewatersys.com> | 7 | * Author: Ryan Mallon |
8 | * | 8 | * |
9 | * Copyright (c) 2009 H Hartley Sweeten <hsweeten@visionengravers.com> | 9 | * Copyright (c) 2009 H Hartley Sweeten <hsweeten@visionengravers.com> |
10 | * | 10 | * |
@@ -644,6 +644,6 @@ module_exit(ep93xxfb_exit); | |||
644 | 644 | ||
645 | MODULE_DESCRIPTION("EP93XX Framebuffer Driver"); | 645 | MODULE_DESCRIPTION("EP93XX Framebuffer Driver"); |
646 | MODULE_ALIAS("platform:ep93xx-fb"); | 646 | MODULE_ALIAS("platform:ep93xx-fb"); |
647 | MODULE_AUTHOR("Ryan Mallon <ryan&bluewatersys.com>, " | 647 | MODULE_AUTHOR("Ryan Mallon, " |
648 | "H Hartley Sweeten <hsweeten@visionengravers.com"); | 648 | "H Hartley Sweeten <hsweeten@visionengravers.com"); |
649 | MODULE_LICENSE("GPL"); | 649 | MODULE_LICENSE("GPL"); |
diff --git a/sound/soc/ep93xx/ep93xx-i2s.c b/sound/soc/ep93xx/ep93xx-i2s.c index 042f4e93746..a37b04e5aee 100644 --- a/sound/soc/ep93xx/ep93xx-i2s.c +++ b/sound/soc/ep93xx/ep93xx-i2s.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * linux/sound/soc/ep93xx-i2s.c | 2 | * linux/sound/soc/ep93xx-i2s.c |
3 | * EP93xx I2S driver | 3 | * EP93xx I2S driver |
4 | * | 4 | * |
5 | * Copyright (C) 2010 Ryan Mallon <ryan@bluewatersys.com> | 5 | * Copyright (C) 2010 Ryan Mallon |
6 | * | 6 | * |
7 | * Based on the original driver by: | 7 | * Based on the original driver by: |
8 | * Copyright (C) 2007 Chase Douglas <chasedouglas@gmail> | 8 | * Copyright (C) 2007 Chase Douglas <chasedouglas@gmail> |
@@ -477,6 +477,6 @@ module_init(ep93xx_i2s_init); | |||
477 | module_exit(ep93xx_i2s_exit); | 477 | module_exit(ep93xx_i2s_exit); |
478 | 478 | ||
479 | MODULE_ALIAS("platform:ep93xx-i2s"); | 479 | MODULE_ALIAS("platform:ep93xx-i2s"); |
480 | MODULE_AUTHOR("Ryan Mallon <ryan@bluewatersys.com>"); | 480 | MODULE_AUTHOR("Ryan Mallon"); |
481 | MODULE_DESCRIPTION("EP93XX I2S driver"); | 481 | MODULE_DESCRIPTION("EP93XX I2S driver"); |
482 | MODULE_LICENSE("GPL"); | 482 | MODULE_LICENSE("GPL"); |
diff --git a/sound/soc/ep93xx/ep93xx-pcm.c b/sound/soc/ep93xx/ep93xx-pcm.c index a456e491155..d009c1793c2 100644 --- a/sound/soc/ep93xx/ep93xx-pcm.c +++ b/sound/soc/ep93xx/ep93xx-pcm.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * Copyright (C) 2006 Applied Data Systems | 5 | * Copyright (C) 2006 Applied Data Systems |
6 | * | 6 | * |
7 | * Rewritten for the SoC audio subsystem (Based on PXA2xx code): | 7 | * Rewritten for the SoC audio subsystem (Based on PXA2xx code): |
8 | * Copyright (c) 2008 Ryan Mallon <ryan@bluewatersys.com> | 8 | * Copyright (c) 2008 Ryan Mallon |
9 | * | 9 | * |
10 | * This program is free software; you can redistribute it and/or modify | 10 | * This program is free software; you can redistribute it and/or modify |
11 | * it under the terms of the GNU General Public License version 2 as | 11 | * it under the terms of the GNU General Public License version 2 as |
@@ -333,6 +333,6 @@ static void __exit ep93xx_soc_platform_exit(void) | |||
333 | module_init(ep93xx_soc_platform_init); | 333 | module_init(ep93xx_soc_platform_init); |
334 | module_exit(ep93xx_soc_platform_exit); | 334 | module_exit(ep93xx_soc_platform_exit); |
335 | 335 | ||
336 | MODULE_AUTHOR("Ryan Mallon <ryan@bluewatersys.com>"); | 336 | MODULE_AUTHOR("Ryan Mallon"); |
337 | MODULE_DESCRIPTION("EP93xx ALSA PCM interface"); | 337 | MODULE_DESCRIPTION("EP93xx ALSA PCM interface"); |
338 | MODULE_LICENSE("GPL"); | 338 | MODULE_LICENSE("GPL"); |
diff --git a/sound/soc/ep93xx/snappercl15.c b/sound/soc/ep93xx/snappercl15.c index dfe1d7f74ea..c8aa8a5003c 100644 --- a/sound/soc/ep93xx/snappercl15.c +++ b/sound/soc/ep93xx/snappercl15.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * snappercl15.c -- SoC audio for Bluewater Systems Snapper CL15 module | 2 | * snappercl15.c -- SoC audio for Bluewater Systems Snapper CL15 module |
3 | * | 3 | * |
4 | * Copyright (C) 2008 Bluewater Systems Ltd | 4 | * Copyright (C) 2008 Bluewater Systems Ltd |
5 | * Author: Ryan Mallon <ryan@bluewatersys.com> | 5 | * Author: Ryan Mallon |
6 | * | 6 | * |
7 | * This program is free software; you can redistribute it and/or modify it | 7 | * This program is free software; you can redistribute it and/or modify it |
8 | * under the terms of the GNU General Public License as published by the | 8 | * under the terms of the GNU General Public License as published by the |
@@ -140,7 +140,7 @@ static void __exit snappercl15_exit(void) | |||
140 | module_init(snappercl15_init); | 140 | module_init(snappercl15_init); |
141 | module_exit(snappercl15_exit); | 141 | module_exit(snappercl15_exit); |
142 | 142 | ||
143 | MODULE_AUTHOR("Ryan Mallon <ryan@bluewatersys.com>"); | 143 | MODULE_AUTHOR("Ryan Mallon"); |
144 | MODULE_DESCRIPTION("ALSA SoC Snapper CL15"); | 144 | MODULE_DESCRIPTION("ALSA SoC Snapper CL15"); |
145 | MODULE_LICENSE("GPL"); | 145 | MODULE_LICENSE("GPL"); |
146 | 146 | ||