| Message ID | 1424419459-3498-16-git-send-email-yamada.m@jp.panasonic.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Fri, Feb 20, 2015 at 05:04:15PM +0900, Masahiro Yamada wrote: > Move arch/arm/include/asm/arch-kirkwood/* > -> arch/arm/mach-kirkwood/include/mach/* > > Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> > Acked-by: Stefan Roese <sr@denx.de> > Cc: Prafulla Wadaskar <prafulla@marvell.com> > Cc: Luka Perkov <luka.perkov@sartura.hr> Applied to u-boot/master, thanks!
diff --git a/MAINTAINERS b/MAINTAINERS index 7a3e963..eef70d0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -99,7 +99,6 @@ M: Luka Perkov <luka.perkov@sartura.hr> S: Maintained T: git git://git.denx.de/u-boot-marvell.git F: arch/arm/mach-kirkwood/ -F: arch/arm/include/asm/arch-kirkwood/ ARM MARVELL PXA M: Marek Vasut <marex@denx.de> diff --git a/arch/arm/include/asm/arch-kirkwood/config.h b/arch/arm/mach-kirkwood/include/mach/config.h similarity index 100% rename from arch/arm/include/asm/arch-kirkwood/config.h rename to arch/arm/mach-kirkwood/include/mach/config.h diff --git a/arch/arm/include/asm/arch-kirkwood/cpu.h b/arch/arm/mach-kirkwood/include/mach/cpu.h similarity index 100% rename from arch/arm/include/asm/arch-kirkwood/cpu.h rename to arch/arm/mach-kirkwood/include/mach/cpu.h diff --git a/arch/arm/include/asm/arch-kirkwood/gpio.h b/arch/arm/mach-kirkwood/include/mach/gpio.h similarity index 100% rename from arch/arm/include/asm/arch-kirkwood/gpio.h rename to arch/arm/mach-kirkwood/include/mach/gpio.h diff --git a/arch/arm/include/asm/arch-kirkwood/kw88f6192.h b/arch/arm/mach-kirkwood/include/mach/kw88f6192.h similarity index 100% rename from arch/arm/include/asm/arch-kirkwood/kw88f6192.h rename to arch/arm/mach-kirkwood/include/mach/kw88f6192.h diff --git a/arch/arm/include/asm/arch-kirkwood/kw88f6281.h b/arch/arm/mach-kirkwood/include/mach/kw88f6281.h similarity index 100% rename from arch/arm/include/asm/arch-kirkwood/kw88f6281.h rename to arch/arm/mach-kirkwood/include/mach/kw88f6281.h diff --git a/arch/arm/include/asm/arch-kirkwood/mpp.h b/arch/arm/mach-kirkwood/include/mach/mpp.h similarity index 100% rename from arch/arm/include/asm/arch-kirkwood/mpp.h rename to arch/arm/mach-kirkwood/include/mach/mpp.h diff --git a/arch/arm/include/asm/arch-kirkwood/soc.h b/arch/arm/mach-kirkwood/include/mach/soc.h similarity index 100% rename from arch/arm/include/asm/arch-kirkwood/soc.h rename to arch/arm/mach-kirkwood/include/mach/soc.h diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index f780f8b..2ed0855 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -195,7 +195,7 @@ } #ifndef __ASSEMBLY__ -#include <asm/arch-kirkwood/gpio.h> +#include <asm/arch/gpio.h> extern void __set_direction(unsigned pin, int high); void set_sda(int state); void set_scl(int state);