summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2014-10-22 12:13:06 +0200
committerTom Rini <trini@ti.com>2014-10-23 09:59:20 -0400
commit3dc23f7852158fafde9eb736060f9e8131997f19 (patch)
tree9304c712d44d32354ff17f1729948d4125ec317b /drivers/block
parentd80cca29fe8876278e6e0c863c869a4cade7e8ad (diff)
downloadtalos-obmc-uboot-3dc23f7852158fafde9eb736060f9e8131997f19.tar.gz
talos-obmc-uboot-3dc23f7852158fafde9eb736060f9e8131997f19.zip
arm: marvell: Move arch/kirkwood.h to arch/soc.h
This move makes is possible to use this header not only from kirkwood platforms but from all Marvell mvebu platforms. Signed-off-by: Stefan Roese <sr@denx.de> Tested-by: Luka Perkov <luka@openwrt.org> Acked-by: Prafulla Wadaskar <prafulla@marvell.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/mvsata_ide.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/mvsata_ide.c b/drivers/block/mvsata_ide.c
index 574bc40b10..e54d564bf7 100644
--- a/drivers/block/mvsata_ide.c
+++ b/drivers/block/mvsata_ide.c
@@ -12,7 +12,7 @@
#if defined(CONFIG_ORION5X)
#include <asm/arch/orion5x.h>
#elif defined(CONFIG_KIRKWOOD)
-#include <asm/arch/kirkwood.h>
+#include <asm/arch/soc.h>
#endif
/* SATA port registers */
OpenPOWER on IntegriCloud