diff options
| author | Kim Phillips <kim.phillips@freescale.com> | 2007-04-23 15:58:17 -0500 |
|---|---|---|
| committer | Kim Phillips <kim.phillips@freescale.com> | 2007-04-23 15:58:17 -0500 |
| commit | 396955fed24c301701c83558fc6f7eadd909397b (patch) | |
| tree | e022bf6f768718ce06a29280f3dfa3a0a60f90f3 /include/asm-blackfin/setup.h | |
| parent | 6fbf261f8df294e589cfadebebe5468e3c0f29e9 (diff) | |
| parent | 14da5f7675bbb427c469e3f45006e027b6e21db9 (diff) | |
| download | u-boot-imx-396955fed24c301701c83558fc6f7eadd909397b.zip u-boot-imx-396955fed24c301701c83558fc6f7eadd909397b.tar.gz u-boot-imx-396955fed24c301701c83558fc6f7eadd909397b.tar.bz2 | |
Merge git://www.denx.de/git/u-boot
Diffstat (limited to 'include/asm-blackfin/setup.h')
| -rw-r--r-- | include/asm-blackfin/setup.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/asm-blackfin/setup.h b/include/asm-blackfin/setup.h index 6ce9688..b6b8267 100644 --- a/include/asm-blackfin/setup.h +++ b/include/asm-blackfin/setup.h @@ -1,7 +1,7 @@ /* * U-boot - setup.h * - * Copyright (c) 2005 blackfin.uclinux.org + * Copyright (c) 2005-2007 Analog Devices Inc. * * This file is based on * asm/setup.h -- Definition of the Linux/Blackfin setup information @@ -22,8 +22,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 */ #ifndef _BLACKFIN_SETUP_H @@ -75,12 +75,13 @@ extern unsigned long vme_brdtype; extern int blackfin_num_memory; /* # of memory blocks found (and used) */ extern int blackfin_realnum_memory; /* real # of memory blocks found */ -extern struct mem_info blackfin_memory[NUM_MEMINFO]; /* memory description */ struct mem_info { unsigned long addr; /* physical address of memory chunk */ unsigned long size; /* length of memory chunk (in bytes) */ }; + +extern struct mem_info blackfin_memory[NUM_MEMINFO]; /* memory description */ #endif #endif |