Merge MTD 4.2-rc fixes into MTD -next (906b1f53) · Commits · e / devices / android_kernel_oneplus_sm8150

MAINTAINERS

+6 −0

Original line number	Diff line number	Diff line
		@@ -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

+5 −5

Original line number	Diff line number	Diff line
		@@ -177,11 +177,6 @@ typedef enum {
		#define NAND_OWN_BUFFERS 0x00020000
		/* 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
		@@ -189,6 +184,11 @@ typedef enum {
		* 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 */