From 450ceda9aec12a0b67cca8dfbaf0384824cbd6c2 Mon Sep 17 00:00:00 2001 From: Zachary T Welch Date: Thu, 3 Dec 2009 04:14:55 -0800 Subject: [PATCH] change #include "nand.h" to Changes from the flat namespace to heirarchical one. Instead of writing: #include "nand.h" the following form should be used. #include The exception is from .c files in the same directory. --- src/ecosboard.c | 2 +- src/flash/arm_nandio.h | 2 +- src/flash/nand/lpc3180.c | 2 +- src/flash/nand/mx3.h | 2 +- src/flash/nand/nonce.c | 2 +- src/flash/nand/s3c24xx.h | 2 +- src/openocd.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/ecosboard.c b/src/ecosboard.c index b42a777c..2464868e 100644 --- a/src/ecosboard.c +++ b/src/ecosboard.c @@ -27,7 +27,7 @@ #include #include "xsvf.h" #include "svf.h" -#include "nand.h" +#include #include "pld.h" #include "server.h" diff --git a/src/flash/arm_nandio.h b/src/flash/arm_nandio.h index 6788e36b..27b3ad35 100644 --- a/src/flash/arm_nandio.h +++ b/src/flash/arm_nandio.h @@ -1,7 +1,7 @@ #ifndef __ARM_NANDIO_H #define __ARM_NANDIO_H -#include "nand.h" +#include #include /** diff --git a/src/flash/nand/lpc3180.c b/src/flash/nand/lpc3180.c index 031e6b1d..80284cc6 100644 --- a/src/flash/nand/lpc3180.c +++ b/src/flash/nand/lpc3180.c @@ -22,7 +22,7 @@ #endif #include "lpc3180.h" -#include "nand.h" +#include static int lpc3180_reset(struct nand_device *nand); static int lpc3180_controller_ready(struct nand_device *nand, int timeout); diff --git a/src/flash/nand/mx3.h b/src/flash/nand/mx3.h index 09289ae2..94dbf0cb 100644 --- a/src/flash/nand/mx3.h +++ b/src/flash/nand/mx3.h @@ -25,7 +25,7 @@ * * Many thanks to Ben Dooks for writing s3c24xx driver. */ -#include "nand.h" +#include #define MX3_NF_BASE_ADDR 0xb8000000 #define MX3_NF_BUFSIZ (MX3_NF_BASE_ADDR + 0xe00) diff --git a/src/flash/nand/nonce.c b/src/flash/nand/nonce.c index dae62a72..f4411640 100644 --- a/src/flash/nand/nonce.c +++ b/src/flash/nand/nonce.c @@ -20,7 +20,7 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include "nand.h" +#include static int nonce_nand_command(struct nand_device *nand, uint8_t command) diff --git a/src/flash/nand/s3c24xx.h b/src/flash/nand/s3c24xx.h index 38057b27..0f899dad 100644 --- a/src/flash/nand/s3c24xx.h +++ b/src/flash/nand/s3c24xx.h @@ -27,7 +27,7 @@ * Many thanks to Simtec Electronics for sponsoring this work. */ -#include "nand.h" +#include #include "s3c24xx_regs.h" struct s3c24xx_nand_controller diff --git a/src/openocd.c b/src/openocd.c index eae8c0c0..9377816f 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -34,7 +34,7 @@ #include #include "xsvf.h" #include "svf.h" -#include "nand.h" +#include #include "pld.h" #include -- 2.39.5