Patchwork [U-Boot,v2,1/3] net: ftmac110: Update license statement

login
register
mail settings
Submitter Kuo-Jung Su
Date July 10, 2013, 1:25 a.m.
Message ID <1373419549-3410-2-git-send-email-dantesu@gmail.com>
Download mbox | patch
Permalink /patch/257950/
State Accepted
Delegated to: Joe Hershberger
Headers show

Comments

Kuo-Jung Su - July 10, 2013, 1:25 a.m.
From: Kuo-Jung Su <dantesu@faraday-tech.com>

Signed-off-by: Kuo-Jung Su <dantesu@faraday-tech.com>
CC: Joe Hershberger <joe.hershberger@gmail.com>
---
 drivers/net/ftmac110.c |   17 ++++++++++++++---
 drivers/net/ftmac110.h |   17 ++++++++++++++---
 2 files changed, 28 insertions(+), 6 deletions(-)

--
1.7.9.5
Joe Hershberger - Aug. 19, 2013, 5:58 p.m.
On Tue, Jul 9, 2013 at 8:25 PM, Kuo-Jung Su <dantesu@gmail.com> wrote:
> From: Kuo-Jung Su <dantesu@faraday-tech.com>
>
> Signed-off-by: Kuo-Jung Su <dantesu@faraday-tech.com>
> CC: Joe Hershberger <joe.hershberger@gmail.com>
> ---

Applied, Thanks!
-Joe

Patch

diff --git a/drivers/net/ftmac110.c b/drivers/net/ftmac110.c
index 35f8633..c7d45e1 100644
--- a/drivers/net/ftmac110.c
+++ b/drivers/net/ftmac110.c
@@ -1,11 +1,22 @@ 
 /*
  * Faraday 10/100Mbps Ethernet Controller
  *
- * (C) Copyright 2010 Faraday Technology
+ * (C) Copyright 2013 Faraday Technology
  * Dante Su <dantesu@faraday-tech.com>
  *
- * This file is released under the terms of GPL v2 and any later version.
- * See the file COPYING in the root directory of the source tree for details.
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */

 #include <common.h>
diff --git a/drivers/net/ftmac110.h b/drivers/net/ftmac110.h
index 5b2d23b..4bb8b76 100644
--- a/drivers/net/ftmac110.h
+++ b/drivers/net/ftmac110.h
@@ -1,11 +1,22 @@ 
 /*
  * Faraday 10/100Mbps Ethernet Controller
  *
- * (C) Copyright 2010 Faraday Technology
+ * (C) Copyright 2013 Faraday Technology
  * Dante Su <dantesu@faraday-tech.com>
  *
- * This file is released under the terms of GPL v2 and any later version.
- * See the file COPYING in the root directory of the source tree for details.
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */

 #ifndef _FTMAC110_H