projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
311bba1
d4092d7
)
Merge branch 'nand/rename-header-file' of git://git.infradead.org/l2-mtd into nand...
author
Boris Brezillon
<boris.brezillon@free-electrons.com>
Wed, 23 Aug 2017 15:00:12 +0000
(17:00 +0200)
committer
Boris Brezillon
<boris.brezillon@free-electrons.com>
Wed, 23 Aug 2017 15:00:12 +0000
(17:00 +0200)
16 files changed:
1
2
drivers/mtd/nand/atmel/nand-controller.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/mtd/nand/lpc32xx_mlc.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/mtd/nand/lpc32xx_slc.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/mtd/nand/mxc_nand.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/mtd/nand/nand_base.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/mtd/nand/nand_hynix.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/mtd/nand/orion_nand.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/mtd/nand/oxnas_nand.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/mtd/nand/qcom_nandc.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/mtd/nand/sh_flctl.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/mtd/nand/sharpsl.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/mtd/nand/sunxi_nand.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/mtd/nand/tmio_nand.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/mtd/nand/vf610_nfc.c
patch
|
diff1
|
diff2
|
blob
|
history
include/linux/mtd/rawnand.h
patch
|
diff1
|
diff2
|
blob
|
history
include/linux/mtd/sharpsl.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/mtd/nand/atmel/nand-controller.c
Simple merge
diff --cc
drivers/mtd/nand/lpc32xx_mlc.c
Simple merge
diff --cc
drivers/mtd/nand/lpc32xx_slc.c
Simple merge
diff --cc
drivers/mtd/nand/mxc_nand.c
Simple merge
diff --cc
drivers/mtd/nand/nand_base.c
Simple merge
diff --cc
drivers/mtd/nand/nand_hynix.c
Simple merge
diff --cc
drivers/mtd/nand/orion_nand.c
Simple merge
diff --cc
drivers/mtd/nand/oxnas_nand.c
Simple merge
diff --cc
drivers/mtd/nand/qcom_nandc.c
Simple merge
diff --cc
drivers/mtd/nand/sh_flctl.c
Simple merge
diff --cc
drivers/mtd/nand/sharpsl.c
Simple merge
diff --cc
drivers/mtd/nand/sunxi_nand.c
Simple merge
diff --cc
drivers/mtd/nand/tmio_nand.c
Simple merge
diff --cc
drivers/mtd/nand/vf610_nfc.c
index
b88a0c9
,
8ba9b6d
..
8037d4b
---
1
/
drivers/mtd/nand/vf610_nfc.c
---
2
/
drivers/mtd/nand/vf610_nfc.c
+++ b/
drivers/mtd/nand/vf610_nfc.c
@@@
-31,9
-31,10
+31,9
@@@
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/mtd/mtd.h>
- #include <linux/mtd/nand.h>
+ #include <linux/mtd/
raw
nand.h>
#include <linux/mtd/partitions.h>
#include <linux/of_device.h>
-#include <linux/pinctrl/consumer.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
diff --cc
include/linux/mtd/rawnand.h
Simple merge
diff --cc
include/linux/mtd/sharpsl.h
Simple merge