diff options
| author | Dave Airlie | 2016-11-07 00:37:09 +0100 |
|---|---|---|
| committer | Dave Airlie | 2016-11-07 00:37:09 +0100 |
| commit | 7b624ad8fea1be7ff4c22643e212191aa6a2a3c2 (patch) | |
| tree | 41d0357d3259868cd85521c3fb9578cd2fc13831 /include/linux/mtd | |
| parent | Merge tag 'omapdrm-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tom... (diff) | |
| parent | Linux 4.9-rc4 (diff) | |
| download | kernel-qcow2-linux-7b624ad8fea1be7ff4c22643e212191aa6a2a3c2.tar.gz kernel-qcow2-linux-7b624ad8fea1be7ff4c22643e212191aa6a2a3c2.tar.xz kernel-qcow2-linux-7b624ad8fea1be7ff4c22643e212191aa6a2a3c2.zip | |
Backmerge tag 'v4.9-rc4' into drm-next
Linux 4.9-rc4
This is needed for nouveau development.
Diffstat (limited to 'include/linux/mtd')
| -rw-r--r-- | include/linux/mtd/nand.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index c5d3d5024fc8..d8905a229f34 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -1184,7 +1184,7 @@ int nand_read_oob_syndrome(struct mtd_info *mtd, struct nand_chip *chip, int page); /* Reset and initialize a NAND device */ -int nand_reset(struct nand_chip *chip); +int nand_reset(struct nand_chip *chip, int chipnr); /* Free resources held by the NAND device */ void nand_cleanup(struct nand_chip *chip); |