diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-12 06:39:21 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-12 06:39:21 -0500 |
| commit | 708b8eae0fd532af73ea8350e6dcc10255ff7376 (patch) | |
| tree | f336436934fd79bc91aff7112a9beb10bc4e839f /arch/cris/arch-v32/lib/nand_init.S | |
| parent | d98d38f2014ab79f28c126ff175d034891f7aefc (diff) | |
| parent | f21f237cf55494c3a4209de323281a3b0528da10 (diff) | |
Merge branch 'linus' into core/locking
Diffstat (limited to 'arch/cris/arch-v32/lib/nand_init.S')
| -rw-r--r-- | arch/cris/arch-v32/lib/nand_init.S | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/cris/arch-v32/lib/nand_init.S b/arch/cris/arch-v32/lib/nand_init.S index e019816facd7..e705f5cce969 100644 --- a/arch/cris/arch-v32/lib/nand_init.S +++ b/arch/cris/arch-v32/lib/nand_init.S | |||
| @@ -22,11 +22,11 @@ | |||
| 22 | ## | 22 | ## |
| 23 | ##============================================================================= | 23 | ##============================================================================= |
| 24 | 24 | ||
| 25 | #include <asm/arch/hwregs/asm/reg_map_asm.h> | 25 | #include <arch/hwregs/asm/reg_map_asm.h> |
| 26 | #include <asm/arch/hwregs/asm/gio_defs_asm.h> | 26 | #include <arch/hwregs/asm/gio_defs_asm.h> |
| 27 | #include <asm/arch/hwregs/asm/pinmux_defs_asm.h> | 27 | #include <arch/hwregs/asm/pinmux_defs_asm.h> |
| 28 | #include <asm/arch/hwregs/asm/bif_core_defs_asm.h> | 28 | #include <arch/hwregs/asm/bif_core_defs_asm.h> |
| 29 | #include <asm/arch/hwregs/asm/config_defs_asm.h> | 29 | #include <arch/hwregs/asm/config_defs_asm.h> |
| 30 | 30 | ||
| 31 | ;; There are 8-bit NAND flashes and 16-bit NAND flashes. | 31 | ;; There are 8-bit NAND flashes and 16-bit NAND flashes. |
| 32 | ;; We need to treat them slightly different. | 32 | ;; We need to treat them slightly different. |