Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a75d6a4c authored by Boris Brezillon's avatar Boris Brezillon
Browse files

Merge branch 'nand/rename-header-file' of git://git.infradead.org/l2-mtd into nand/next

parents 311bba10 d4092d76
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ mirrored table is performed.

The most important field in the nand_bbt_descr structure is the
options field. The options define most of the table properties. Use the
predefined constants from nand.h to define the options.
predefined constants from rawnand.h to define the options.

-  Number of bits per block

@@ -843,7 +843,7 @@ Chip option constants
Constants for chip id table
~~~~~~~~~~~~~~~~~~~~~~~~~~~

These constants are defined in nand.h. They are OR-ed together to
These constants are defined in rawnand.h. They are OR-ed together to
describe the chip functionality::

    /* Buswitdh is 16 bit */
@@ -865,7 +865,7 @@ describe the chip functionality::
Constants for runtime options
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

These constants are defined in nand.h. They are OR-ed together to
These constants are defined in rawnand.h. They are OR-ed together to
describe the functionality::

    /* The hw ecc generator provides a syndrome instead a ecc value on read
@@ -956,7 +956,7 @@ developer. Each struct member has a short description which is marked
with an [XXX] identifier. See the chapter "Documentation hints" for an
explanation.

.. kernel-doc:: include/linux/mtd/nand.h
.. kernel-doc:: include/linux/mtd/rawnand.h
   :internal:

Public Functions Provided
+1 −1
Original line number Diff line number Diff line
@@ -9034,7 +9034,7 @@ T: git git://git.infradead.org/linux-mtd.git nand/fixes
T:	git git://git.infradead.org/l2-mtd.git nand/next
S:	Maintained
F:	drivers/mtd/nand/
F:	include/linux/mtd/nand*.h
F:	include/linux/mtd/*nand*.h

NATSEMI ETHERNET DRIVER (DP8381x)
S:	Orphan
+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@
#include <linux/input/tps6507x-ts.h>
#include <linux/mfd/tps6507x.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h>
#include <linux/mtd/rawnand.h>
#include <linux/mtd/partitions.h>
#include <linux/mtd/physmap.h>
#include <linux/platform_device.h>
+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@
#include <linux/platform_device.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
#include <linux/mtd/nand.h>
#include <linux/mtd/rawnand.h>
#include <linux/i2c.h>
#include <linux/gpio.h>
#include <linux/clk.h>
+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@
#include <linux/platform_device.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
#include <linux/mtd/nand.h>
#include <linux/mtd/rawnand.h>
#include <linux/i2c.h>
#include <linux/gpio.h>
#include <linux/clk.h>
Loading