diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-06 14:59:18 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-06 14:59:18 -0400 |
| commit | 5047f09b56d0bc3c21aec9cb16de60283da645c6 (patch) | |
| tree | 09a07554b933c3bb912ce3bfc0ea7c7e1f16041c /include/asm-ppc | |
| parent | c0f1fe00c3923135b2c2f443448585482da8a53e (diff) | |
| parent | 5528e568a760442e0ec8fd2dea1f0791875a066b (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')
| -rw-r--r-- | include/asm-ppc/commproc.h | 1 | ||||
| -rw-r--r-- | include/asm-ppc/cpm2.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-ppc/commproc.h b/include/asm-ppc/commproc.h index 64a2623def02..3247bea5fc2b 100644 --- a/include/asm-ppc/commproc.h +++ b/include/asm-ppc/commproc.h | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | #define CPM_CR_INIT_TX ((ushort)0x0002) | 34 | #define CPM_CR_INIT_TX ((ushort)0x0002) |
| 35 | #define CPM_CR_HUNT_MODE ((ushort)0x0003) | 35 | #define CPM_CR_HUNT_MODE ((ushort)0x0003) |
| 36 | #define CPM_CR_STOP_TX ((ushort)0x0004) | 36 | #define CPM_CR_STOP_TX ((ushort)0x0004) |
| 37 | #define CPM_CR_GRA_STOP_TX ((ushort)0x0005) | ||
| 37 | #define CPM_CR_RESTART_TX ((ushort)0x0006) | 38 | #define CPM_CR_RESTART_TX ((ushort)0x0006) |
| 38 | #define CPM_CR_CLOSE_RX_BD ((ushort)0x0007) | 39 | #define CPM_CR_CLOSE_RX_BD ((ushort)0x0007) |
| 39 | #define CPM_CR_SET_GADDR ((ushort)0x0008) | 40 | #define CPM_CR_SET_GADDR ((ushort)0x0008) |
diff --git a/include/asm-ppc/cpm2.h b/include/asm-ppc/cpm2.h index b638b87cebe3..c70344b91049 100644 --- a/include/asm-ppc/cpm2.h +++ b/include/asm-ppc/cpm2.h | |||
| @@ -69,7 +69,7 @@ | |||
| 69 | #define CPM_CR_INIT_TX ((ushort)0x0002) | 69 | #define CPM_CR_INIT_TX ((ushort)0x0002) |
| 70 | #define CPM_CR_HUNT_MODE ((ushort)0x0003) | 70 | #define CPM_CR_HUNT_MODE ((ushort)0x0003) |
| 71 | #define CPM_CR_STOP_TX ((ushort)0x0004) | 71 | #define CPM_CR_STOP_TX ((ushort)0x0004) |
| 72 | #define CPM_CR_GRA_STOP_TX ((ushort)0x0005) | 72 | #define CPM_CR_GRA_STOP_TX ((ushort)0x0005) |
| 73 | #define CPM_CR_RESTART_TX ((ushort)0x0006) | 73 | #define CPM_CR_RESTART_TX ((ushort)0x0006) |
| 74 | #define CPM_CR_SET_GADDR ((ushort)0x0008) | 74 | #define CPM_CR_SET_GADDR ((ushort)0x0008) |
| 75 | #define CPM_CR_START_IDMA ((ushort)0x0009) | 75 | #define CPM_CR_START_IDMA ((ushort)0x0009) |