diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-23 05:54:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-23 05:54:51 -0400 |
| commit | ad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893 (patch) | |
| tree | 07e491fd3b782d47811a1b3d31d51b0a0d4630df /arch/arm/mach-netx/nxdkn.c | |
| parent | 0cd21ebcc51e6d2500e303446f68d86a6f473ccb (diff) | |
| parent | af6871683e25100813d35b3d802f1ed7b90b9f3a (diff) | |
Merge branch 'atag_offset' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-netx/nxdkn.c')
| -rw-r--r-- | arch/arm/mach-netx/nxdkn.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-netx/nxdkn.c b/arch/arm/mach-netx/nxdkn.c index d775cbe07278..c63384aba500 100644 --- a/arch/arm/mach-netx/nxdkn.c +++ b/arch/arm/mach-netx/nxdkn.c | |||
| @@ -93,7 +93,7 @@ static void __init nxdkn_init(void) | |||
| 93 | } | 93 | } |
| 94 | 94 | ||
| 95 | MACHINE_START(NXDKN, "Hilscher nxdkn") | 95 | MACHINE_START(NXDKN, "Hilscher nxdkn") |
| 96 | .boot_params = 0x80000100, | 96 | .atag_offset = 0x100, |
| 97 | .map_io = netx_map_io, | 97 | .map_io = netx_map_io, |
| 98 | .init_irq = netx_init_irq, | 98 | .init_irq = netx_init_irq, |
| 99 | .timer = &netx_timer, | 99 | .timer = &netx_timer, |