diff options
Diffstat (limited to 'include/asm-arm/plat-s3c')
-rw-r--r-- | include/asm-arm/plat-s3c/nand.h | 5 | ||||
-rw-r--r-- | include/asm-arm/plat-s3c/uncompress.h | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/include/asm-arm/plat-s3c/nand.h b/include/asm-arm/plat-s3c/nand.h index 8816f7f9cee1..ad6bbe90616e 100644 --- a/include/asm-arm/plat-s3c/nand.h +++ b/include/asm-arm/plat-s3c/nand.h | |||
@@ -22,11 +22,14 @@ | |||
22 | */ | 22 | */ |
23 | 23 | ||
24 | struct s3c2410_nand_set { | 24 | struct s3c2410_nand_set { |
25 | unsigned int disable_ecc : 1; | ||
26 | |||
25 | int nr_chips; | 27 | int nr_chips; |
26 | int nr_partitions; | 28 | int nr_partitions; |
27 | char *name; | 29 | char *name; |
28 | int *nr_map; | 30 | int *nr_map; |
29 | struct mtd_partition *partitions; | 31 | struct mtd_partition *partitions; |
32 | struct nand_ecclayout *ecc_layout; | ||
30 | }; | 33 | }; |
31 | 34 | ||
32 | struct s3c2410_platform_nand { | 35 | struct s3c2410_platform_nand { |
@@ -36,6 +39,8 @@ struct s3c2410_platform_nand { | |||
36 | int twrph0; /* active time for nWE/nOE */ | 39 | int twrph0; /* active time for nWE/nOE */ |
37 | int twrph1; /* time for release CLE/ALE from nWE/nOE inactive */ | 40 | int twrph1; /* time for release CLE/ALE from nWE/nOE inactive */ |
38 | 41 | ||
42 | unsigned int ignore_unset_ecc : 1; | ||
43 | |||
39 | int nr_sets; | 44 | int nr_sets; |
40 | struct s3c2410_nand_set *sets; | 45 | struct s3c2410_nand_set *sets; |
41 | 46 | ||
diff --git a/include/asm-arm/plat-s3c/uncompress.h b/include/asm-arm/plat-s3c/uncompress.h index b5e6208175d1..19b9eda39485 100644 --- a/include/asm-arm/plat-s3c/uncompress.h +++ b/include/asm-arm/plat-s3c/uncompress.h | |||
@@ -27,8 +27,8 @@ static void arch_detect_cpu(void); | |||
27 | 27 | ||
28 | /* defines for UART registers */ | 28 | /* defines for UART registers */ |
29 | 29 | ||
30 | #include "asm/plat-s3c/regs-serial.h" | 30 | #include <asm/plat-s3c/regs-serial.h> |
31 | #include "asm/plat-s3c/regs-watchdog.h" | 31 | #include <asm/plat-s3c/regs-watchdog.h> |
32 | 32 | ||
33 | /* working in physical space... */ | 33 | /* working in physical space... */ |
34 | #undef S3C2410_WDOGREG | 34 | #undef S3C2410_WDOGREG |