diff --git a/[refs] b/[refs] index 60d7c28eed2a..9e5d7ade8995 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 17f4425d5b6819dd53a5c22577844a1d16bf6ccb +refs/heads/master: 8322cd4bf189ccdbb0e0bff0c0c9bb6755d5038e diff --git a/trunk/arch/arm/mach-shark/core.c b/trunk/arch/arm/mach-shark/core.c index ac2873c8014b..feda3ca7fc95 100644 --- a/trunk/arch/arm/mach-shark/core.c +++ b/trunk/arch/arm/mach-shark/core.c @@ -152,7 +152,7 @@ static struct sys_timer shark_timer = { MACHINE_START(SHARK, "Shark") /* Maintainer: Alexander Schulz */ - .boot_params = 0x08003000, + .atag_offset = 0x3000, .map_io = shark_map_io, .init_irq = shark_init_irq, .timer = &shark_timer,