diff mbox

mtd: spi-nor: add the copyright information

Message ID 1397118448-23788-1-git-send-email-b32955@freescale.com
State Accepted
Commit 8eabdd1ec122cf6b77cf73e798f134fbace1b8d1
Headers show

Commit Message

Huang Shijie April 10, 2014, 8:27 a.m. UTC 
Add the copyright information for spi-nor.c and spi-nor.h.

Signed-off-by: Huang Shijie <b32955@freescale.com>
---
based on Brian's patch set.
---
 drivers/mtd/spi-nor/spi-nor.c |    6 +++++-
 include/linux/mtd/spi-nor.h   |    9 +++++++++
 2 files changed, 14 insertions(+), 1 deletions(-)

Comments

Brian Norris April 10, 2014, 7:03 p.m. UTC | #1 
On Thu, Apr 10, 2014 at 04:27:28PM +0800, Huang Shijie wrote:
> Add the copyright information for spi-nor.c and spi-nor.h.
> 
> Signed-off-by: Huang Shijie <b32955@freescale.com>
> ---

Pushed to l2-mtd.git/spinor. Thanks!

> based on Brian's patch set.

BTW, it applied fine with and without my patchset, so I just took it
first.

Thanks,
Brian
diff mbox

Patch

diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
index de04d6e..d6f44d5 100644
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -1,5 +1,9 @@ 
 /*
- * Cloned most of the code from the m25p80.c
+ * Based on m25p80.c, by Mike Lavender (mike@steroidmicros.com), with
+ * influence from lart.c (Abraham Van Der Merwe) and mtd_dataflash.c
+ *
+ * Copyright (C) 2005, Intec Automation Inc.
+ * Copyright (C) 2014, Freescale Semiconductor, Inc.
  *
  * This code 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/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h
index 2a5c301..835f40a 100644
--- a/include/linux/mtd/spi-nor.h
+++ b/include/linux/mtd/spi-nor.h
@@ -1,3 +1,12 @@ 
+/*
+ * Copyright (C) 2014 Freescale Semiconductor, Inc.
+ *
+ * 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.
+ */
+
 #ifndef __LINUX_MTD_SPI_NOR_H
 #define __LINUX_MTD_SPI_NOR_H