diff options
author | Stefan Roese <sr@denx.de> | 2007-04-29 16:40:31 +0200 |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2007-04-29 16:40:31 +0200 |
commit | bd38b7ecfdf01e0b7bce551a0834226630be81c1 (patch) | |
tree | e86a79fb7791af81a3325d0e177abdc2d97624d4 /include/asm-blackfin/string.h | |
parent | 6f69bbc8f33f03f6a1adf845101c15a9917ff5f5 (diff) | |
parent | 14da5f7675bbb427c469e3f45006e027b6e21db9 (diff) | |
download | u-boot-imx-bd38b7ecfdf01e0b7bce551a0834226630be81c1.zip u-boot-imx-bd38b7ecfdf01e0b7bce551a0834226630be81c1.tar.gz u-boot-imx-bd38b7ecfdf01e0b7bce551a0834226630be81c1.tar.bz2 |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'include/asm-blackfin/string.h')
-rw-r--r-- | include/asm-blackfin/string.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/asm-blackfin/string.h b/include/asm-blackfin/string.h index aac6bc9..dd50207 100644 --- a/include/asm-blackfin/string.h +++ b/include/asm-blackfin/string.h @@ -1,7 +1,7 @@ /* * U-boot - string.h String functions * - * Copyright (c) 2005 blackfin.uclinux.org + * Copyright (c) 2005-2007 Analog Devices Inc. * * See file CREDITS for list of people who contributed to this * project. @@ -18,8 +18,8 @@ * * 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 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + * MA 02110-1301 USA */ /* Changed by Lineo Inc. May 2001 */ @@ -30,7 +30,6 @@ #ifdef __KERNEL__ /* only set these up for kernel code */ #include <asm/setup.h> -#include <asm/page.h> #include <config.h> #include <asm/blackfin.h> |