diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-09-25 08:06:20 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-09-25 08:06:20 +0200 |
| commit | 39bdcdfb814a22c8143c04938268378e9994b7dd (patch) | |
| tree | 4eeea3247892cab65f10a25d2910fad021cbe7f0 /arch/arm/mach-omap/am33xx_generic.c | |
| parent | e083790340aa4cf1b8edaa50f6b9fbb1edfe56d0 (diff) | |
| parent | 8fb0a2bf6efb67084a5d7a7f3822b4d480fca685 (diff) | |
| download | barebox-39bdcdfb814a22c8143c04938268378e9994b7dd.tar.gz barebox-39bdcdfb814a22c8143c04938268378e9994b7dd.tar.xz | |
Merge branch 'for-next/misc' into master
Diffstat (limited to 'arch/arm/mach-omap/am33xx_generic.c')
| -rw-r--r-- | arch/arm/mach-omap/am33xx_generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap/am33xx_generic.c b/arch/arm/mach-omap/am33xx_generic.c index 7577df761c..3c5cdf065c 100644 --- a/arch/arm/mach-omap/am33xx_generic.c +++ b/arch/arm/mach-omap/am33xx_generic.c @@ -244,7 +244,7 @@ int am33xx_init(void) { omap_gpmc_base = (void *)AM33XX_GPMC_BASE; - restart_handler_register_fn(am33xx_restart_soc); + restart_handler_register_fn("soc", am33xx_restart_soc); am33xx_enable_per_clocks(); |