diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /Documentation/mips | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'Documentation/mips')
| -rw-r--r-- | Documentation/mips/AU1xxx_IDE.README | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/mips/AU1xxx_IDE.README b/Documentation/mips/AU1xxx_IDE.README index 8ace35ebdcd5..cc887ecfd6eb 100644 --- a/Documentation/mips/AU1xxx_IDE.README +++ b/Documentation/mips/AU1xxx_IDE.README | |||
| @@ -39,13 +39,13 @@ Note: for more information, please refer "AMD Alchemy Au1200/Au1550 IDE | |||
| 39 | Interface and Linux Device Driver" Application Note. | 39 | Interface and Linux Device Driver" Application Note. |
| 40 | 40 | ||
| 41 | 41 | ||
| 42 | FILES, CONFIGS AND COMPATABILITY | 42 | FILES, CONFIGS AND COMPATIBILITY |
| 43 | -------------------------------- | 43 | -------------------------------- |
| 44 | 44 | ||
| 45 | Two files are introduced: | 45 | Two files are introduced: |
| 46 | 46 | ||
| 47 | a) 'arch/mips/include/asm/mach-au1x00/au1xxx_ide.h' | 47 | a) 'arch/mips/include/asm/mach-au1x00/au1xxx_ide.h' |
| 48 | containes : struct _auide_hwif | 48 | contains : struct _auide_hwif |
| 49 | timing parameters for PIO mode 0/1/2/3/4 | 49 | timing parameters for PIO mode 0/1/2/3/4 |
| 50 | timing parameters for MWDMA 0/1/2 | 50 | timing parameters for MWDMA 0/1/2 |
| 51 | 51 | ||