diff options
| author | Johan Hovold <johan@kernel.org> | 2014-09-15 12:07:37 -0400 |
|---|---|---|
| committer | Johan Hovold <johan@kernel.org> | 2014-09-15 12:10:34 -0400 |
| commit | 4b7154ba70bb20a3c024faabdd2bc207b550a813 (patch) | |
| tree | 99a6e1204ec5deaca27bcbfc75ca16d3633433f2 /include/linux/mtd/nand.h | |
| parent | adceac14166da8c466223a35ec59c4a4adeef976 (diff) | |
| parent | 9e82bf014195d6f0054982c463575cdce24292be (diff) | |
Merge tag 'v3.17-rc5' into usb-next
USB fixes in Linux 3.17-rc5 are needed to build on top of for 3.18.
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'include/linux/mtd/nand.h')
| -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 3083c53e0270..c300db3ae285 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h | |||
| @@ -949,7 +949,7 @@ static inline int jedec_feature(struct nand_chip *chip) | |||
| 949 | : 0; | 949 | : 0; |
| 950 | } | 950 | } |
| 951 | 951 | ||
| 952 | /** | 952 | /* |
| 953 | * struct nand_sdr_timings - SDR NAND chip timings | 953 | * struct nand_sdr_timings - SDR NAND chip timings |
| 954 | * | 954 | * |
| 955 | * This struct defines the timing requirements of a SDR NAND chip. | 955 | * This struct defines the timing requirements of a SDR NAND chip. |