[U-Boot-Users] [PATCH] fix comments with new drivers organization
Wolfgang Denk
wd at denx.de
Wed Jan 9 21:50:02 CET 2008
In message <1198981846-5954-1-git-send-email-marcel at ziswiler.com> you wrote:
> Signed-off-by: Marcel Ziswiler <marcel at ziswiler.com>
> ---
> README | 4 ++--
> board/sc3/sc3.c | 2 +-
> board/ssv/common/cmd_sled.c | 4 ++--
> common/env_nand.c | 2 +-
> cpu/ppc4xx/405gp_pci.c | 2 +-
> doc/README.generic_usb_ohci | 2 +-
> doc/README.modnet50 | 4 ++--
> drivers/mtd/nand/nand_util.c | 2 +-
> drivers/net/sk98lin/Makefile | 2 +-
> drivers/usb/isp116x-hcd.c | 2 +-
> drivers/usb/usbdcore_mpc8xx.c | 3 ++-
> drivers/video/cfb_console.c | 8 ++++----
> fs/jffs2/jffs2_1pass.c | 2 +-
> include/configs/CATcenter.h | 2 +-
> include/configs/MPC8313ERDB.h | 2 +-
> include/configs/PPChameleonEVB.h | 2 +-
> include/configs/SX1.h | 2 +-
> include/configs/integratorcp.h | 2 +-
> include/configs/omap1510inn.h | 2 +-
> include/configs/omap2420h4.h | 2 +-
> include/configs/omap5912osk.h | 2 +-
> nand_spl/board/amcc/acadia/Makefile | 2 +-
> nand_spl/board/amcc/bamboo/Makefile | 2 +-
> nand_spl/board/amcc/sequoia/Makefile | 2 +-
> 24 files changed, 31 insertions(+), 30 deletions(-)
Applied, thanks.
Got some warnings:
error: cpu/ppc4xx/405gp_pci.c: does not exist in index
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Renamed cpu/ppc4xx/405gp_pci.c => cpu/ppc4xx/4xx_pci.c
Auto-merged cpu/ppc4xx/4xx_pci.c
Auto-merged README
Auto-merged include/configs/MPC8313ERDB.h
Auto-merged include/configs/PPChameleonEVB.h
Auto-merged nand_spl/board/amcc/acadia/Makefile
Auto-merged nand_spl/board/amcc/sequoia/Makefile
Please check if the result is what you had in mind. Thanks.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Oblivion together does not frighten me, beloved.
-- Thalassa (in Anne Mulhall's body), "Return to Tomorrow",
stardate 4770.3.
More information about the U-Boot
mailing list