diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-24 19:13:59 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-24 19:13:59 +0000 |
| commit | 83fe628e16d84efc8df2731bc403eae4e4f53801 (patch) | |
| tree | 9a51c292235621d0f4f632c2a55ddb5a6ab582af /arch/arm/mach-s3c2440/mach-mini2440.c | |
| parent | 853a0231e057c04255a848f6998f84faaa635c58 (diff) | |
| parent | 426f1af947c61dee48a9267f84bff227e503a547 (diff) | |
Merge branch 'renesas/soc' into next/soc2
Diffstat (limited to 'arch/arm/mach-s3c2440/mach-mini2440.c')
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-mini2440.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2440/mach-mini2440.c b/arch/arm/mach-s3c2440/mach-mini2440.c index adbbb85bc4c..5d66fb218a4 100644 --- a/arch/arm/mach-s3c2440/mach-mini2440.c +++ b/arch/arm/mach-s3c2440/mach-mini2440.c @@ -701,5 +701,5 @@ MACHINE_START(MINI2440, "MINI2440") .init_machine = mini2440_init, .init_irq = s3c24xx_init_irq, .timer = &s3c24xx_timer, - .restart = s3c2440_restart, + .restart = s3c244x_restart, MACHINE_END |