From 2a90c26974a29ef3a33886930a36eae458fe6b37 Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Mon, 4 Mar 2013 14:52:25 +0200 Subject: [PATCH] --- yaml --- r: 374718 b: refs/heads/master c: 88ad4b162adb3821815d0098987040fca26c7d80 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/mtd/nand.h | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1ff7654b85d7..aa2b8c759bcd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 96dca4c29c5e4fc158f8f31513994408c90c6818 +refs/heads/master: 88ad4b162adb3821815d0098987040fca26c7d80 diff --git a/trunk/include/linux/mtd/nand.h b/trunk/include/linux/mtd/nand.h index 10fd7df07b5e..ec0a74877714 100644 --- a/trunk/include/linux/mtd/nand.h +++ b/trunk/include/linux/mtd/nand.h @@ -147,8 +147,6 @@ typedef enum { #define NAND_BUSWIDTH_16 0x00000002 /* Chip has cache program function */ #define NAND_CACHEPRG 0x00000008 -/* Chip has copy back function */ -#define NAND_COPYBACK 0x00000010 /* * Chip requires ready check on read (for auto-incremented sequential read). * True only for small page devices; large page devices do not support @@ -169,11 +167,10 @@ typedef enum { #define NAND_SUBPAGE_READ 0x00001000 /* Options valid for Samsung large page devices */ -#define NAND_SAMSUNG_LP_OPTIONS (NAND_CACHEPRG | NAND_COPYBACK) +#define NAND_SAMSUNG_LP_OPTIONS (NAND_CACHEPRG) /* Macros to identify the above */ #define NAND_HAS_CACHEPROG(chip) ((chip->options & NAND_CACHEPRG)) -#define NAND_HAS_COPYBACK(chip) ((chip->options & NAND_COPYBACK)) #define NAND_HAS_SUBPAGE_READ(chip) ((chip->options & NAND_SUBPAGE_READ)) /* Non chip related options */