X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fnand%2Fs3c24xx.h;h=c69de2eef3cfff51812002ffab7d40bfe100b07d;hp=f89bf6e91e5c6ae4e68267e030f42b69c9592795;hb=refs%2Fchanges%2F26%2F1426%2F4;hpb=2a402ae2c7bf5ce515ff5bfdd7d68f875686e289

diff --git a/src/flash/nand/s3c24xx.h b/src/flash/nand/s3c24xx.h
index f89bf6e91e..c69de2eef3 100644
--- a/src/flash/nand/s3c24xx.h
+++ b/src/flash/nand/s3c24xx.h
@@ -15,7 +15,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 #ifndef S3C24xx_NAND_H
@@ -27,13 +27,11 @@
  * Many thanks to Simtec Electronics for sponsoring this work.
  */
 
-#include <flash/nand.h>
-#include <flash/nand/s3c24xx_regs.h>
-
-struct s3c24xx_nand_controller
-{
-	struct target *target;
+#include "imp.h"
+#include "s3c24xx_regs.h"
+#include <target/target.h>
 
+struct s3c24xx_nand_controller {
 	/* register addresses */
 	uint32_t		 cmd;
 	uint32_t		 addr;
@@ -67,8 +65,6 @@ int s3c24xx_address(struct nand_device *nand, uint8_t address);
 int s3c24xx_write_data(struct nand_device *nand, uint16_t data);
 int s3c24xx_read_data(struct nand_device *nand, void *data);
 
-int s3c24xx_controller_ready(struct nand_device *nand, int tout);
-
 #define s3c24xx_write_page NULL
 #define s3c24xx_read_page NULL
 
@@ -81,4 +77,4 @@ int s3c2440_read_block_data(struct nand_device *nand,
 int s3c2440_write_block_data(struct nand_device *nand,
 		uint8_t *data, int data_size);
 
-#endif // S3C24xx_NAND_H
+#endif /* S3C24xx_NAND_H */