diff options
author | Marian Balakowicz <m8@semihalf.com> | 2008-02-29 13:56:44 +0100 |
---|---|---|
committer | Marian Balakowicz <m8@semihalf.com> | 2008-02-29 13:56:44 +0100 |
commit | e18489e8c27e843e337258fb00f2652ff0f43b92 (patch) | |
tree | 2a3b2afa224e61cb7f1206a1641007e526d25160 /board/netstal/common | |
parent | 75fa002c47171b73fb4c1f2c2fe4d6391c136276 (diff) | |
parent | b29661fc1151077776454288051bc9a488351ce8 (diff) | |
download | u-boot-imx-e18489e8c27e843e337258fb00f2652ff0f43b92.zip u-boot-imx-e18489e8c27e843e337258fb00f2652ff0f43b92.tar.gz u-boot-imx-e18489e8c27e843e337258fb00f2652ff0f43b92.tar.bz2 |
Merge branch 'master' of git://www.denx.de/git/u-boot into new-image
Diffstat (limited to 'board/netstal/common')
-rw-r--r-- | board/netstal/common/nm.h | 1 | ||||
-rw-r--r-- | board/netstal/common/nm_bsp.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/board/netstal/common/nm.h b/board/netstal/common/nm.h index 9357f3a..3dff1d6 100644 --- a/board/netstal/common/nm.h +++ b/board/netstal/common/nm.h @@ -42,4 +42,3 @@ void show_sdram_registers(void); #endif long int init_ppc405_sdram(unsigned int dram_size); #endif - diff --git a/board/netstal/common/nm_bsp.c b/board/netstal/common/nm_bsp.c index 89c697c..86f491b 100644 --- a/board/netstal/common/nm_bsp.c +++ b/board/netstal/common/nm_bsp.c @@ -133,4 +133,3 @@ void common_misc_init_r(void) saveenv(); } } - |