diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-11-28 19:57:38 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-11-28 19:57:38 +0100 |
| commit | 68435fa1519cb92493fd59e05bc9dbe7f2205feb (patch) | |
| tree | c9f8c096f08608c1307e8ea59f061b265c6ebb66 /board/afeb9260 | |
| parent | d5251742a7b2465c8de2841bc7db5a1e059c13a3 (diff) | |
| parent | 623e03256e222b42fb86fd81fafe508e3cb569a4 (diff) | |
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
* 'agust@denx.de' of git://git.denx.de/u-boot-staging:
MAKEALL: drop obsolete mx31pdk_nand target
dataflash: fix parameters order in write_dataflash()
hawkboard: Replace HAWKBOARD_KICK{0, 1}_UNLOCK defines
davinci_sonata: define CONFIG_MACH_TYPE for davinci_sonata board
davinci_schmoogie: define CONFIG_MACH_TYPE for davinci_schmoogie board
arm: a320evb: define mach-type in board config file
OMAP3: Use sdelay from arch/arm/cpu/armv7/syslib.c instead of cloning that.
Fix Stelian's email address
Diffstat (limited to 'board/afeb9260')
| -rw-r--r-- | board/afeb9260/Makefile | 2 | ||||
| -rw-r--r-- | board/afeb9260/afeb9260.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/board/afeb9260/Makefile b/board/afeb9260/Makefile index 9134856e28..c56bcf8da3 100644 --- a/board/afeb9260/Makefile +++ b/board/afeb9260/Makefile @@ -3,7 +3,7 @@ # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # # (C) Copyright 2008 -# Stelian Pop <stelian.pop@leadtechdesign.com> +# Stelian Pop <stelian@popies.net> # Lead Tech Design <www.leadtechdesign.com> # # See file CREDITS for list of people who contributed to this diff --git a/board/afeb9260/afeb9260.c b/board/afeb9260/afeb9260.c index f0e2e801c4..dda69e0291 100644 --- a/board/afeb9260/afeb9260.c +++ b/board/afeb9260/afeb9260.c @@ -1,6 +1,6 @@ /* * (C) Copyright 2007-2008 - * Stelian Pop <stelian.pop@leadtechdesign.com> + * Stelian Pop <stelian@popies.net> * Lead Tech Design <www.leadtechdesign.com> * (C) Copyright 2008 Sergey Lapin <slapin@ossfans.org> * |