Message ID | 1391056041-31669-4-git-send-email-yamada.m@jp.panasonic.com |
---|---|
State | Superseded |
Delegated to: | Tom Rini |
Headers | show |
On 29 January 2014 21:27, Masahiro Yamada <yamada.m@jp.panasonic.com> wrote: > - Delete fs.xml from DOCBOOKS to fix an error > Commit e3ff797c added fs.xml to DOCBOOKS > but missed to add doc/DocBook/fs.tmpl > - Fix the location of include guard in include/linker_lists.h > > Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> > Reported-by: Abraham Varricatt <abraham.varricatt@vvdntech.com> Acked-by: Simon Glass <sjg@chromium.org>
Hello Simon, > > - Delete fs.xml from DOCBOOKS to fix an error > > Commit e3ff797c added fs.xml to DOCBOOKS > > but missed to add doc/DocBook/fs.tmpl You added "fs.xml" to doc/DocBook/Makefile in commit e3ff797c. but the template file is missing. So I thought you had forgotten to git add doc/DocBook/fs.tmpl. Best Regards Masahiro Yamada
diff --git a/doc/DocBook/Makefile b/doc/DocBook/Makefile index 3077134..44afc47 100644 --- a/doc/DocBook/Makefile +++ b/doc/DocBook/Makefile @@ -6,7 +6,7 @@ # To add a new book the only step required is to add the book to the # list of DOCBOOKS. -DOCBOOKS := fs.xml linker_lists.xml stdio.xml +DOCBOOKS := linker_lists.xml stdio.xml ### # The build process is as follows (targets): diff --git a/include/linker_lists.h b/include/linker_lists.h index 1eebb95..997d149 100644 --- a/include/linker_lists.h +++ b/include/linker_lists.h @@ -8,6 +8,9 @@ * SPDX-License-Identifier: GPL-2.0+ */ +#ifndef __LINKER_LISTS_H__ +#define __LINKER_LISTS_H__ + /* * There is no use in including this from ASM files, but that happens * anyway, e.g. PPC kgdb.S includes command.h which incluse us. @@ -97,9 +100,6 @@ * %u_boot_list_2_drivers_3 */ -#ifndef __LINKER_LISTS_H__ -#define __LINKER_LISTS_H__ - /** * ll_entry_declare() - Declare linker-generated array entry * @_type: Data type of the entry
- Delete fs.xml from DOCBOOKS to fix an error Commit e3ff797c added fs.xml to DOCBOOKS but missed to add doc/DocBook/fs.tmpl - Fix the location of include guard in include/linker_lists.h Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Reported-by: Abraham Varricatt <abraham.varricatt@vvdntech.com> --- This problem was reported by Abraham Varricatt: http://u-boot.10912.n7.nabble.com/quot-make-htmldocs-quot-gives-error-td168840.html doc/DocBook/Makefile | 2 +- include/linker_lists.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)