diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-04 15:09:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-04 15:09:52 -0700 |
| commit | d98550e334715b2d9e45f8f0f4e1608720108640 (patch) | |
| tree | cd6a52960d479701cf6a29fd6535627481c5b27d /include/asm-ppc/commproc.h | |
| parent | f9cc8475e7595dbb41a9567f83288e2cd7445b6c (diff) | |
| parent | d205819e2346d20fee41297ea6cf789c591abccf (diff) | |
| download | op-kernel-dev-d98550e334715b2d9e45f8f0f4e1608720108640.zip op-kernel-dev-d98550e334715b2d9e45f8f0f4e1608720108640.tar.gz | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[PATCH] powerpc: Use the ibm,pa-features property if available
powerpc: Fix incorrect might_sleep in __get_user/__put_user on kernel addresses
[PATCH] ppc32 CPM_UART: fixes and improvements
[PATCH] ppc32 CPM_UART: Fixed break send on SCC
[PATCH] powerpc/kprobes: fix singlestep out-of-line
[PATCH] powerpc/pseries: avoid crash in PCI code if mem system not up
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 973e609..31f3629 100644 --- a/include/asm-ppc/commproc.h +++ b/include/asm-ppc/commproc.h @@ -35,6 +35,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) |
