X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fnand%2Forion.c;h=3ab2364d64ff9ad2f06ec98ab23d4f7e8beedd50;hb=7bb79f0f51e2c925ca99c82232e805569e9c39f2;hp=b124deee6f086848a787a06a0dd5ae96750c0b77;hpb=66985bb30619c412984a2cfa1c0b3c4a324dbe78;p=openocd.git

diff --git a/src/flash/nand/orion.c b/src/flash/nand/orion.c
index b124deee6f..3ab2364d64 100644
--- a/src/flash/nand/orion.c
+++ b/src/flash/nand/orion.c
@@ -26,8 +26,9 @@
 #include "config.h"
 #endif
 
-#include <flash/arm_nandio.h>
-#include <target/armv4_5.h>
+#include "imp.h"
+#include "arm_io.h"
+#include <target/arm.h>
 
 
 struct orion_nand_controller
@@ -115,11 +116,6 @@ static int orion_nand_reset(struct nand_device *nand)
 	return orion_nand_command(nand, NAND_CMD_RESET);
 }
 
-static int orion_nand_controller_ready(struct nand_device *nand, int timeout)
-{
-	return 1;
-}
-
 NAND_DEVICE_COMMAND_HANDLER(orion_nand_device_command)
 {
 	struct orion_nand_controller *hw;
@@ -174,7 +170,6 @@ struct nand_flash_controller orion_nand_controller =
 	.write_data		= orion_nand_write,
 	.write_block_data	= orion_nand_fast_block_write,
 	.reset			= orion_nand_reset,
-	.controller_ready	= orion_nand_controller_ready,
 	.nand_device_command	= orion_nand_device_command,
 	.init			= orion_nand_init,
 };