Commit d0fc2eaaf4c56a95f5ed29b6bfb609e19714fc16 "powerpc/fsl: Refactor device bindings" split out a number of device bindings from booting-without-of.txt into separate files. Having them all in one file was a frequent source of merge conflicts. However, in the next merge, 49997d75152b3d23c53b0fa730599f2f74c92c65, there was another conflict. Some of the bindings removed from booting-without-of.txt were mistakenly added back in and the copies in dts-bindings were kept as well. This patch re-removes "Freescale Display Interface" and "Freescale on board FPGA" and fixes the table of contents. Signed-off-by: Trent Piepho <tpiepho@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org> |
||
|---|---|---|
| .. | ||
| dts-bindings | ||
| 00-INDEX | ||
| booting-without-of.txt | ||
| bootwrapper.txt | ||
| cpu_features.txt | ||
| eeh-pci-error-recovery.txt | ||
| hvcs.txt | ||
| kvm_440.txt | ||
| mpc52xx-device-tree-bindings.txt | ||
| mpc52xx.txt | ||
| phyp-assisted-dump.txt | ||
| qe_firmware.txt | ||
| sound.txt | ||
| zImage_layout.txt | ||