_dinsdale

git status & git diff barebox-freebsd

Apr 28th, 2016
137
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.39 KB | None | 0 0
  1. git status
  2. On branch master
  3. Your branch is up-to-date with 'origin/master'.
  4. Changes not staged for commit:
  5. (use "git add <file>..." to update what will be committed)
  6. (use "git checkout -- <file>..." to discard changes in working directory)
  7.  
  8. modified: scripts/imx/imx-image.c
  9. modified: scripts/include/tools/endian.h
  10.  
  11. Untracked files:
  12. (use "git add <file>..." to include in what will be committed)
  13.  
  14. scripts/include/asm/types.h
  15. scripts/include/tools/byteswap.h
  16. scripts/include/tools/wordsize.h
  17.  
  18. no changes added to commit (use "git add" and/or "git commit -a")
  19.  
  20.  
  21. diff --git a/scripts/imx/imx-image.c b/scripts/imx/imx-image.c
  22. index 16f086a..c8fe5bf 100644
  23. --- a/scripts/imx/imx-image.c
  24. +++ b/scripts/imx/imx-image.c
  25. @@ -26,7 +26,7 @@
  26. #include <sys/types.h>
  27. #include <sys/stat.h>
  28. #include <fcntl.h>
  29. -#include <endian.h>
  30. +#include <tools/endian.h>
  31. #include <linux/kernel.h>
  32. #include <sys/file.h>
  33. -----------------------------------------------------------------------------------------
  34. diff --git a/scripts/include/tools/endian.h b/scripts/include/tools/endian.h
  35. index 8001194..df58631 100644
  36. --- a/scripts/include/tools/endian.h
  37. +++ b/scripts/include/tools/endian.h
  38. @@ -1,7 +1,7 @@
  39. #ifndef _TOOLS_ENDIAN_H
  40. #define _TOOLS_ENDIAN_H
  41.  
  42. -#include <byteswap.h>
  43. +#include <tools/byteswap.h>
  44.  
  45. #if __BYTE_ORDER == __LITTLE_ENDIAN
Add Comment
Please, Sign In to add comment