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-omap1/board-fsample.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-omap1/board-fsample.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-fsample.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c index a6b1bea5037..999789c4811 100644 --- a/arch/arm/mach-omap1/board-fsample.c +++ b/arch/arm/mach-omap1/board-fsample.c | |||
| @@ -389,7 +389,7 @@ static void __init omap_fsample_map_io(void) | |||
| 389 | 389 | ||
| 390 | MACHINE_START(OMAP_FSAMPLE, "OMAP730 F-Sample") | 390 | MACHINE_START(OMAP_FSAMPLE, "OMAP730 F-Sample") |
| 391 | /* Maintainer: Brian Swetland <swetland@google.com> */ | 391 | /* Maintainer: Brian Swetland <swetland@google.com> */ |
| 392 | .boot_params = 0x10000100, | 392 | .atag_offset = 0x100, |
| 393 | .map_io = omap_fsample_map_io, | 393 | .map_io = omap_fsample_map_io, |
| 394 | .reserve = omap_reserve, | 394 | .reserve = omap_reserve, |
| 395 | .init_irq = omap_fsample_init_irq, | 395 | .init_irq = omap_fsample_init_irq, |