diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-11-19 09:48:07 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-11-19 09:48:07 -0500 |
| commit | dba0a918722ee0f0ba3442575e4448c3ab622be4 (patch) | |
| tree | fdb466cf09e7916135098d651b18924b2fe9ba5f /Documentation/sh | |
| parent | 0996e6382482ce9014787693d3884e9468153a5c (diff) | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'Documentation/sh')
| -rw-r--r-- | Documentation/sh/new-machine.txt | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Documentation/sh/new-machine.txt b/Documentation/sh/new-machine.txt index 5482bf5d005b..f0354164cb0e 100644 --- a/Documentation/sh/new-machine.txt +++ b/Documentation/sh/new-machine.txt | |||
| @@ -47,9 +47,7 @@ Next, for companion chips: | |||
| 47 | `-- sh | 47 | `-- sh |
| 48 | `-- cchips | 48 | `-- cchips |
| 49 | `-- hd6446x | 49 | `-- hd6446x |
| 50 | |-- hd64461 | 50 | `-- hd64461 |
| 51 | | `-- cchip-specific files | ||
| 52 | `-- hd64465 | ||
| 53 | `-- cchip-specific files | 51 | `-- cchip-specific files |
| 54 | 52 | ||
| 55 | ... and so on. Headers for the companion chips are treated the same way as | 53 | ... and so on. Headers for the companion chips are treated the same way as |