diff --git a/[refs] b/[refs] index ad9098ce5983..18250fc4823b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db6b672f983eff887c8be0fb2ceee1c02d867dea +refs/heads/master: 6eb5be341173ceae788d5d846f20de6d1b67b2db diff --git a/trunk/arch/arm/mach-mvebu/armada-370-xp.c b/trunk/arch/arm/mach-mvebu/armada-370-xp.c index 4ef923b032ec..b46418a8b352 100644 --- a/trunk/arch/arm/mach-mvebu/armada-370-xp.c +++ b/trunk/arch/arm/mach-mvebu/armada-370-xp.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include "armada-370-xp.h" #include "common.h" static struct map_desc armada_370_xp_io_desc[] __initdata = { diff --git a/trunk/arch/arm/mach-mvebu/include/mach/armada-370-xp.h b/trunk/arch/arm/mach-mvebu/armada-370-xp.h similarity index 100% rename from trunk/arch/arm/mach-mvebu/include/mach/armada-370-xp.h rename to trunk/arch/arm/mach-mvebu/armada-370-xp.h