diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-01-08 19:56:37 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-08 19:56:37 -0500 |
| commit | 04cf399640b7acfa9abe2eb7900cd934db8af697 (patch) | |
| tree | f9a055f2f0170550f5f0b0507b06ffce8d98945d /arch/arm/mach-h720x/h7201-eval.c | |
| parent | 17f0056e6a2f3d1818801705f5e12b71217bf4ef (diff) | |
| parent | a0e86bd4252519321b0d102dc4ed90557aa7bee9 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest
Conflicts:
arch/arm/mach-shmobile/Makefile
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/arm/mach-h720x/h7201-eval.c')
| -rw-r--r-- | arch/arm/mach-h720x/h7201-eval.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-h720x/h7201-eval.c b/arch/arm/mach-h720x/h7201-eval.c index 9886f19805f4..5fdb20c855e2 100644 --- a/arch/arm/mach-h720x/h7201-eval.c +++ b/arch/arm/mach-h720x/h7201-eval.c | |||
| @@ -34,4 +34,5 @@ MACHINE_START(H7201, "Hynix GMS30C7201") | |||
| 34 | .init_irq = h720x_init_irq, | 34 | .init_irq = h720x_init_irq, |
| 35 | .timer = &h7201_timer, | 35 | .timer = &h7201_timer, |
| 36 | .dma_zone_size = SZ_256M, | 36 | .dma_zone_size = SZ_256M, |
| 37 | .restart = h720x_restart, | ||
| 37 | MACHINE_END | 38 | MACHINE_END |