diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-15 20:19:52 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-15 20:19:52 -0400 |
| commit | 18594822fcb01d4b35e05b9018f770a0b4156d1a (patch) | |
| tree | 38d35c38086a564beaac215f8e52694cdbfab1c3 /include/asm-ppc/commproc.h | |
| parent | 5b5ffbc1e6d62d89747f3f59c09b2e488a7d7fce (diff) | |
| parent | c4694c76ce28dd7e415b4f3014d8c6e580b5f3d2 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'include/asm-ppc/commproc.h')
| -rw-r--r-- | include/asm-ppc/commproc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-ppc/commproc.h b/include/asm-ppc/commproc.h index 973e60908234..31f362966a58 100644 --- a/include/asm-ppc/commproc.h +++ b/include/asm-ppc/commproc.h | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | #define CPM_CR_INIT_TX ((ushort)0x0002) | 35 | #define CPM_CR_INIT_TX ((ushort)0x0002) |
| 36 | #define CPM_CR_HUNT_MODE ((ushort)0x0003) | 36 | #define CPM_CR_HUNT_MODE ((ushort)0x0003) |
| 37 | #define CPM_CR_STOP_TX ((ushort)0x0004) | 37 | #define CPM_CR_STOP_TX ((ushort)0x0004) |
| 38 | #define CPM_CR_GRA_STOP_TX ((ushort)0x0005) | ||
| 38 | #define CPM_CR_RESTART_TX ((ushort)0x0006) | 39 | #define CPM_CR_RESTART_TX ((ushort)0x0006) |
| 39 | #define CPM_CR_CLOSE_RX_BD ((ushort)0x0007) | 40 | #define CPM_CR_CLOSE_RX_BD ((ushort)0x0007) |
| 40 | #define CPM_CR_SET_GADDR ((ushort)0x0008) | 41 | #define CPM_CR_SET_GADDR ((ushort)0x0008) |