Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'for-linus-20150724' of git://git.infradead.org/linux-mtd
Pull MTD fixes from Brian Norris:
"Two trivial updates. I meant to send these much earlier, but I've
been preoccupied.
- Add MAINTAINERS entry for diskonchip g3 driver
- Fix an overlooked conflict in bitfield value assignments
The latter update is a bit overdue, but there's no reason to wait any
longer"
* tag 'for-linus-20150724' of git://git.infradead.org/linux-mtd:
mtd: nand: Fix NAND_USE_BOUNCE_BUFFER flag conflict
MAINTAINERS: mtd: docg3: add docg3 maintainer
+11
-5
+6
MAINTAINERS
+6
MAINTAINERS
···
6838
6838
S: Maintained
6839
6839
F: drivers/media/usb/msi2500/
6840
6840
6841
+
MSYSTEMS DISKONCHIP G3 MTD DRIVER
6842
+
M: Robert Jarzmik <robert.jarzmik@free.fr>
6843
+
L: linux-mtd@lists.infradead.org
6844
+
S: Maintained
6845
+
F: drivers/mtd/devices/docg3*
6846
+
6841
6847
MT9M032 APTINA SENSOR DRIVER
6842
6848
M: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
6843
6849
L: linux-media@vger.kernel.org
+5
-5
include/linux/mtd/nand.h
+5
-5
include/linux/mtd/nand.h
···
178
178
/* Chip may not exist, so silence any errors in scan */
179
179
#define NAND_SCAN_SILENT_NODEV 0x00040000
180
180
/*
181
-
* This option could be defined by controller drivers to protect against
182
-
* kmap'ed, vmalloc'ed highmem buffers being passed from upper layers
183
-
*/
184
-
#define NAND_USE_BOUNCE_BUFFER 0x00080000
185
-
/*
186
181
* Autodetect nand buswidth with readid/onfi.
187
182
* This suppose the driver will configure the hardware in 8 bits mode
188
183
* when calling nand_scan_ident, and update its configuration
189
184
* before calling nand_scan_tail.
190
185
*/
191
186
#define NAND_BUSWIDTH_AUTO 0x00080000
187
+
/*
188
+
* This option could be defined by controller drivers to protect against
189
+
* kmap'ed, vmalloc'ed highmem buffers being passed from upper layers
190
+
*/
191
+
#define NAND_USE_BOUNCE_BUFFER 0x00100000
192
192
193
193
/* Options set by nand scan */
194
194
/* Nand scan has allocated controller struct */