diff options
| author | Tom Rini <trini@konsulko.com> | 2015-05-30 20:16:01 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-05-30 20:16:01 -0400 |
| commit | 43b1ff5f33456e85b2fccccaf2f9fe09821a45ac (patch) | |
| tree | 0e75720408e20f807f250c7cf862c780f2a68b41 /arch/arm/mach-uniphier/reset.c | |
| parent | b1f7ecc9b5f0ce07691f6804f436fcaa2a377b26 (diff) | |
| parent | fcb2525d373f7a5bab213e8a89681bd3b7d09c44 (diff) | |
| download | u-boot-imx-43b1ff5f33456e85b2fccccaf2f9fe09821a45ac.zip u-boot-imx-43b1ff5f33456e85b2fccccaf2f9fe09821a45ac.tar.gz u-boot-imx-43b1ff5f33456e85b2fccccaf2f9fe09821a45ac.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'arch/arm/mach-uniphier/reset.c')
| -rw-r--r-- | arch/arm/mach-uniphier/reset.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-uniphier/reset.c b/arch/arm/mach-uniphier/reset.c index 005fbcf..4c82511 100644 --- a/arch/arm/mach-uniphier/reset.c +++ b/arch/arm/mach-uniphier/reset.c @@ -1,12 +1,11 @@ /* - * Copyright (C) 2012-2014 Panasonic Corporation - * Author: Masahiro Yamada <yamada.m@jp.panasonic.com> + * Copyright (C) 2012-2015 Masahiro Yamada <yamada.masahiro@socionext.com> * * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> -#include <asm/io.h> +#include <linux/io.h> #include <mach/sc-regs.h> void reset_cpu(unsigned long ignored) |