diff options
| author | Stefano Babic <sbabic@denx.de> | 2013-07-31 11:30:38 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2013-07-31 11:30:38 +0200 |
| commit | 326ea986ac150acdc7656d57fca647db80b50158 (patch) | |
| tree | 15724288b8b6da3a98d934db8330bb964cdfdf36 /drivers/net/cs8900.h | |
| parent | 4acb4d391f005c0c72f7b84041b3884e4260a5a4 (diff) | |
| parent | fdce7b633a1de24456226b18527cc7900c34282a (diff) | |
| download | olio-uboot-2014.01-326ea986ac150acdc7656d57fca647db80b50158.tar.xz olio-uboot-2014.01-326ea986ac150acdc7656d57fca647db80b50158.zip | |
Merge git://git.denx.de/u-boot-arm
Conflicts:
board/freescale/mx6qsabrelite/Makefile
board/freescale/mx6qsabrelite/mx6qsabrelite.c
include/configs/mx6qsabrelite.h
Signed-off-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'drivers/net/cs8900.h')
| -rw-r--r-- | drivers/net/cs8900.h | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/drivers/net/cs8900.h b/drivers/net/cs8900.h index 23c5cb07b..79877dd57 100644 --- a/drivers/net/cs8900.h +++ b/drivers/net/cs8900.h @@ -12,9 +12,6 @@ * * Copyright (C) 1999 Ben Williamson <benw@pobox.com> * - * See file CREDITS for list of people who contributed to this - * project. - * * This program is loaded into SRAM in bootstrap mode, where it waits * for commands on UART1 to read and write memory, jump to code etc. * A design goal for this program is to be entirely independent of the @@ -22,19 +19,7 @@ * this code in bootstrap mode. All the board specifics can be handled on * the host. * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * SPDX-License-Identifier: GPL-2.0+ */ #include <asm/types.h> |