[FE training-materials-updates] Merge branch 'master' of git.free-electrons.com:training-materials

michael.opdenacker at free-electrons.com michael.opdenacker at free-electrons.com
Sun May 13 17:04:59 CEST 2012


- Log -----------------------------------------------------------------
http://git.free-electrons.com/training-materials/commit/?id=c5d6f7826bb3eb110e50d8bfcf2115e34dcfd4b2

commit c5d6f7826bb3eb110e50d8bfcf2115e34dcfd4b2
Merge: 72f48ed b5d2643
Author: Michael Opdenacker <michael.opdenacker at free-electrons.com>
Date:   Sun May 13 17:04:54 2012 +0200

    Merge branch 'master' of git.free-electrons.com:training-materials

diff --cc slides/sysdev-flash-filesystems/sysdev-flash-filesystems.tex
index ad35d3e,03609f2..8053fab
--- a/slides/sysdev-flash-filesystems/sysdev-flash-filesystems.tex
+++ b/slides/sysdev-flash-filesystems/sysdev-flash-filesystems.tex
@@@ -61,10 -61,10 +61,10 @@@
  
    MTD partitions are defined in the kernel, in the board
    definitions. Example from
 -  \code{arch/arm/mach-omap2/board-igep0020.c} example:
 +  \code{arch/arm/mach-omap2/board-igep0020.c}:
  \scriptsize
  \begin{verbatim}
- static struct mtd_partition igep2_onenand_partitions[] = {
+ static struct mtd_partition igep2_flash_partitions[] = {
      {
          .name   = "X-Loader",
          .offset = 0,

http://git.free-electrons.com/training-materials/commit/?id=72f48edb9f48aa40f8969a3f0cb37088dbc5b5dc

commit 72f48edb9f48aa40f8969a3f0cb37088dbc5b5dc
Author: Michael Opdenacker <michael.opdenacker at free-electrons.com>
Date:   Sun May 13 17:04:06 2012 +0200

    Removed double "example" word

diff --git a/slides/sysdev-flash-filesystems/sysdev-flash-filesystems.tex b/slides/sysdev-flash-filesystems/sysdev-flash-filesystems.tex
index 3a66ea5..ad35d3e 100644
--- a/slides/sysdev-flash-filesystems/sysdev-flash-filesystems.tex
+++ b/slides/sysdev-flash-filesystems/sysdev-flash-filesystems.tex
@@ -61,7 +61,7 @@
 
   MTD partitions are defined in the kernel, in the board
   definitions. Example from
-  \code{arch/arm/mach-omap2/board-igep0020.c} example:
+  \code{arch/arm/mach-omap2/board-igep0020.c}:
 \scriptsize
 \begin{verbatim}
 static struct mtd_partition igep2_onenand_partitions[] = {

-----------------------------------------------------------------------

Summary of changes:
 .../sysdev-flash-filesystems.tex                   |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


More information about the training-materials-updates mailing list