diff options
| author | Michael Brandt <Michael.Brandt@stericsson.com> | 2009-10-26 10:23:13 +0100 |
|---|---|---|
| committer | Michael Brandt <Michael.Brandt@stericsson.com> | 2009-10-26 10:23:13 +0100 |
| commit | dd037f7a4f779bdfa9984b0db74a1bcdf7170fe9 (patch) | |
| tree | ca7e06ab2c6ebd83269d24542b0881e622f314da /board/samsung/smdk2400 | |
| parent | 4bd4413ae52e40d8e4c4e801b8d6bc3daf3229e3 (diff) | |
| parent | f3ee25859e3920ee7c7cc519a3e6f60d70d7a53f (diff) | |
Merge branch 'master' of http://git.denx.de/u-boot
Conflicts:
Makefile
Diffstat (limited to 'board/samsung/smdk2400')
| -rw-r--r-- | board/samsung/smdk2400/smdk2400.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/board/samsung/smdk2400/smdk2400.c b/board/samsung/smdk2400/smdk2400.c index 2c47063e9..42bf00868 100644 --- a/board/samsung/smdk2400/smdk2400.c +++ b/board/samsung/smdk2400/smdk2400.c @@ -46,8 +46,9 @@ extern int do_mdm_init; /* defined in common/main.c */ int board_init (void) { - S3C24X0_CLOCK_POWER * const clk_power = S3C24X0_GetBase_CLOCK_POWER(); - S3C24X0_GPIO * const gpio = S3C24X0_GetBase_GPIO(); + struct s3c24x0_clock_power * const clk_power = + s3c24x0_get_base_clock_power(); + struct s3c24x0_gpio * const gpio = s3c24x0_get_base_gpio(); /* memory and cpu-speed are setup before relocation */ /* change the clock to be 50 MHz 1:1:1 */ |