]> git.baikalelectronics.ru Git - kernel.git/commit
powerpc: Repair device bindings documentation
authorTrent Piepho <tpiepho@freescale.com>
Mon, 10 Nov 2008 21:09:21 +0000 (13:09 -0800)
committerKumar Gala <galak@kernel.crashing.org>
Mon, 10 Nov 2008 21:17:52 +0000 (15:17 -0600)
commit4c6efd3e47fa1e7d27ad3149993072e5194f9a08
tree65e3d0429e487d491889b354144c5c56823c3891
parent600147f0eb12f6f167e14755dcf4c83148e5a811
powerpc: Repair device bindings documentation

Commit 15cce9fa493a7ce0aa42b4ba0eeb7b18a755b4df "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, 3f27fa542e2dcb68afbd2db86a046d336d1fa3bf, 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>
Documentation/powerpc/booting-without-of.txt