diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2015-07-07 13:10:30 -0700 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2015-07-07 13:10:30 -0700 |
| commit | 906b1f536d5b1a26e549c78a07b664f22340b7df (patch) | |
| tree | feaaa68ea2fc70513e0cd150c3fad82e6d61f843 | |
| parent | 5891a8d11f79b9a45a7334a63d0fa731875bc308 (diff) | |
| parent | 5f867db63473f32cce1b868e281ebd42a41f8fad (diff) | |
| download | linux-906b1f536d5b1a26e549c78a07b664f22340b7df.tar.gz linux-906b1f536d5b1a26e549c78a07b664f22340b7df.tar.bz2 linux-906b1f536d5b1a26e549c78a07b664f22340b7df.zip | |
Merge MTD 4.2-rc fixes into MTD -next
| -rw-r--r-- | MAINTAINERS | 6 | ||||
| -rw-r--r-- | include/linux/mtd/nand.h | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 8133cefb6b6e..956732963740 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6824,6 +6824,12 @@ T: git git://linuxtv.org/anttip/media_tree.git S: Maintained F: drivers/media/usb/msi2500/ +MSYSTEMS DISKONCHIP G3 MTD DRIVER +M: Robert Jarzmik <robert.jarzmik@free.fr> +L: linux-mtd@lists.infradead.org +S: Maintained +F: drivers/mtd/devices/docg3* + MT9M032 APTINA SENSOR DRIVER M: Laurent Pinchart <laurent.pinchart@ideasonboard.com> L: linux-media@vger.kernel.org diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index f25e2bdd188c..272f42952f34 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -178,17 +178,17 @@ typedef enum { /* Chip may not exist, so silence any errors in scan */ #define NAND_SCAN_SILENT_NODEV 0x00040000 /* - * This option could be defined by controller drivers to protect against - * kmap'ed, vmalloc'ed highmem buffers being passed from upper layers - */ -#define NAND_USE_BOUNCE_BUFFER 0x00080000 -/* * Autodetect nand buswidth with readid/onfi. * This suppose the driver will configure the hardware in 8 bits mode * when calling nand_scan_ident, and update its configuration * before calling nand_scan_tail. */ #define NAND_BUSWIDTH_AUTO 0x00080000 +/* + * This option could be defined by controller drivers to protect against + * kmap'ed, vmalloc'ed highmem buffers being passed from upper layers + */ +#define NAND_USE_BOUNCE_BUFFER 0x00100000 /* Options set by nand scan */ /* Nand scan has allocated controller struct */ |