diff options
author | David Woodhouse <dwmw2@infradead.org> | 2006-05-06 20:59:18 +0200 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-06 20:59:18 +0200 |
commit | 5047f09b56d0bc3c21aec9cb16de60283da645c6 (patch) | |
tree | 09a07554b933c3bb912ce3bfc0ea7c7e1f16041c /include/asm-ppc/commproc.h | |
parent | Revert include/media changes: Mauro says those ioctls are only used in-kernel(!) (diff) | |
parent | [TCP]: Fix snd_cwnd adjustments in tcp_highspeed.c (diff) | |
download | linux-5047f09b56d0bc3c21aec9cb16de60283da645c6.tar.xz linux-5047f09b56d0bc3c21aec9cb16de60283da645c6.zip |
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 64a2623def02..3247bea5fc2b 100644 --- a/include/asm-ppc/commproc.h +++ b/include/asm-ppc/commproc.h @@ -34,6 +34,7 @@ #define CPM_CR_INIT_TX ((ushort)0x0002) #define CPM_CR_HUNT_MODE ((ushort)0x0003) #define CPM_CR_STOP_TX ((ushort)0x0004) +#define CPM_CR_GRA_STOP_TX ((ushort)0x0005) #define CPM_CR_RESTART_TX ((ushort)0x0006) #define CPM_CR_CLOSE_RX_BD ((ushort)0x0007) #define CPM_CR_SET_GADDR ((ushort)0x0008) |