diff options
author | Martyn Welch <martyn.welch@ge.com> | 2010-02-18 10:12:52 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-03 19:43:00 -0500 |
commit | 66bd8db52ab48e7189e02d4bf1f23109cc1ede70 (patch) | |
tree | fe113abb95fd2f6b2ab85a0e78c9828bbf34afe9 | |
parent | a94f530a5ee36f72e0377d081023b8d23dacf7ce (diff) |
Staging: vme: Renaming following split of GE Fanuc joint venture
This patch corrects author email addresses and Copyright notices as a
result of the split up of the GE Fanuc joint venture.
Signed-off-by: Martyn Welch <martyn.welch@gefanuc.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/vme/bridges/vme_ca91cx42.c | 4 | ||||
-rw-r--r-- | drivers/staging/vme/bridges/vme_ca91cx42.h | 4 | ||||
-rw-r--r-- | drivers/staging/vme/bridges/vme_tsi148.c | 4 | ||||
-rw-r--r-- | drivers/staging/vme/devices/vme_user.c | 6 | ||||
-rw-r--r-- | drivers/staging/vme/vme.c | 6 |
5 files changed, 12 insertions, 12 deletions
diff --git a/drivers/staging/vme/bridges/vme_ca91cx42.c b/drivers/staging/vme/bridges/vme_ca91cx42.c index 807278485bbf..272cc26ba5ac 100644 --- a/drivers/staging/vme/bridges/vme_ca91cx42.c +++ b/drivers/staging/vme/bridges/vme_ca91cx42.c | |||
@@ -1,8 +1,8 @@ | |||
1 | /* | 1 | /* |
2 | * Support for the Tundra Universe I/II VME-PCI Bridge Chips | 2 | * Support for the Tundra Universe I/II VME-PCI Bridge Chips |
3 | * | 3 | * |
4 | * Author: Martyn Welch <martyn.welch@gefanuc.com> | 4 | * Author: Martyn Welch <martyn.welch@ge.com> |
5 | * Copyright 2008 GE Fanuc Intelligent Platforms Embedded Systems, Inc. | 5 | * Copyright 2008 GE Intelligent Platforms Embedded Systems, Inc. |
6 | * | 6 | * |
7 | * Based on work by Tom Armistead and Ajit Prem | 7 | * Based on work by Tom Armistead and Ajit Prem |
8 | * Copyright 2004 Motorola Inc. | 8 | * Copyright 2004 Motorola Inc. |
diff --git a/drivers/staging/vme/bridges/vme_ca91cx42.h b/drivers/staging/vme/bridges/vme_ca91cx42.h index 95a42c240a20..2a9ad1454f4e 100644 --- a/drivers/staging/vme/bridges/vme_ca91cx42.h +++ b/drivers/staging/vme/bridges/vme_ca91cx42.h | |||
@@ -7,8 +7,8 @@ | |||
7 | * Updated by Ajit Prem | 7 | * Updated by Ajit Prem |
8 | * Copyright 2004 Motorola Inc. | 8 | * Copyright 2004 Motorola Inc. |
9 | * | 9 | * |
10 | * Further updated by Martyn Welch <martyn.welch@gefanuc.com> | 10 | * Further updated by Martyn Welch <martyn.welch@ge.com> |
11 | * Copyright 2009 GE Fanuc Intelligent Platforms Embedded Systems, Inc. | 11 | * Copyright 2009 GE Intelligent Platforms Embedded Systems, Inc. |
12 | * | 12 | * |
13 | * Derived from ca91c042.h by Michael Wyrick | 13 | * Derived from ca91c042.h by Michael Wyrick |
14 | * | 14 | * |
diff --git a/drivers/staging/vme/bridges/vme_tsi148.c b/drivers/staging/vme/bridges/vme_tsi148.c index ed8297daf9ee..2ca5126627cd 100644 --- a/drivers/staging/vme/bridges/vme_tsi148.c +++ b/drivers/staging/vme/bridges/vme_tsi148.c | |||
@@ -1,8 +1,8 @@ | |||
1 | /* | 1 | /* |
2 | * Support for the Tundra TSI148 VME-PCI Bridge Chip | 2 | * Support for the Tundra TSI148 VME-PCI Bridge Chip |
3 | * | 3 | * |
4 | * Author: Martyn Welch <martyn.welch@gefanuc.com> | 4 | * Author: Martyn Welch <martyn.welch@ge.com> |
5 | * Copyright 2008 GE Fanuc Intelligent Platforms Embedded Systems, Inc. | 5 | * Copyright 2008 GE Intelligent Platforms Embedded Systems, Inc. |
6 | * | 6 | * |
7 | * Based on work by Tom Armistead and Ajit Prem | 7 | * Based on work by Tom Armistead and Ajit Prem |
8 | * Copyright 2004 Motorola Inc. | 8 | * Copyright 2004 Motorola Inc. |
diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c index 2159540d9383..48d46cadb13f 100644 --- a/drivers/staging/vme/devices/vme_user.c +++ b/drivers/staging/vme/devices/vme_user.c | |||
@@ -1,8 +1,8 @@ | |||
1 | /* | 1 | /* |
2 | * VMEbus User access driver | 2 | * VMEbus User access driver |
3 | * | 3 | * |
4 | * Author: Martyn Welch <martyn.welch@gefanuc.com> | 4 | * Author: Martyn Welch <martyn.welch@ge.com> |
5 | * Copyright 2008 GE Fanuc Intelligent Platforms Embedded Systems, Inc. | 5 | * Copyright 2008 GE Intelligent Platforms Embedded Systems, Inc. |
6 | * | 6 | * |
7 | * Based on work by: | 7 | * Based on work by: |
8 | * Tom Armistead and Ajit Prem | 8 | * Tom Armistead and Ajit Prem |
@@ -818,7 +818,7 @@ MODULE_PARM_DESC(bus, "Enumeration of VMEbus to which the driver is connected"); | |||
818 | module_param_array(bus, int, &bus_num, 0); | 818 | module_param_array(bus, int, &bus_num, 0); |
819 | 819 | ||
820 | MODULE_DESCRIPTION("VME User Space Access Driver"); | 820 | MODULE_DESCRIPTION("VME User Space Access Driver"); |
821 | MODULE_AUTHOR("Martyn Welch <martyn.welch@gefanuc.com"); | 821 | MODULE_AUTHOR("Martyn Welch <martyn.welch@ge.com"); |
822 | MODULE_LICENSE("GPL"); | 822 | MODULE_LICENSE("GPL"); |
823 | 823 | ||
824 | module_init(vme_user_init); | 824 | module_init(vme_user_init); |
diff --git a/drivers/staging/vme/vme.c b/drivers/staging/vme/vme.c index c915e9285780..8d8f9cb2974d 100644 --- a/drivers/staging/vme/vme.c +++ b/drivers/staging/vme/vme.c | |||
@@ -1,8 +1,8 @@ | |||
1 | /* | 1 | /* |
2 | * VME Bridge Framework | 2 | * VME Bridge Framework |
3 | * | 3 | * |
4 | * Author: Martyn Welch <martyn.welch@gefanuc.com> | 4 | * Author: Martyn Welch <martyn.welch@ge.com> |
5 | * Copyright 2008 GE Fanuc Intelligent Platforms Embedded Systems, Inc. | 5 | * Copyright 2008 GE Intelligent Platforms Embedded Systems, Inc. |
6 | * | 6 | * |
7 | * Based on work by Tom Armistead and Ajit Prem | 7 | * Based on work by Tom Armistead and Ajit Prem |
8 | * Copyright 2004 Motorola Inc. | 8 | * Copyright 2004 Motorola Inc. |
@@ -1533,7 +1533,7 @@ static void __exit vme_exit(void) | |||
1533 | } | 1533 | } |
1534 | 1534 | ||
1535 | MODULE_DESCRIPTION("VME bridge driver framework"); | 1535 | MODULE_DESCRIPTION("VME bridge driver framework"); |
1536 | MODULE_AUTHOR("Martyn Welch <martyn.welch@gefanuc.com"); | 1536 | MODULE_AUTHOR("Martyn Welch <martyn.welch@ge.com"); |
1537 | MODULE_LICENSE("GPL"); | 1537 | MODULE_LICENSE("GPL"); |
1538 | 1538 | ||
1539 | module_init(vme_init); | 1539 | module_init(vme_init); |