diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-16 20:24:53 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-16 20:24:53 -0400 |
| commit | 492b057c426e4aa747484958e18e9da29003985d (patch) | |
| tree | 34e08c24618688d8bcc190523028b5f94cce0c0b /arch/powerpc/include | |
| parent | 313485175da221c388f6a8ecf4c30062ba9bea17 (diff) | |
| parent | 300df7dc89cc276377fc020704e34875d5c473b6 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'arch/powerpc/include')
| -rw-r--r-- | arch/powerpc/include/asm/qe.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/qe.h b/arch/powerpc/include/asm/qe.h index e0faf332c9c9..157c5ca581c8 100644 --- a/arch/powerpc/include/asm/qe.h +++ b/arch/powerpc/include/asm/qe.h | |||
| @@ -675,6 +675,8 @@ struct ucc_slow_pram { | |||
| 675 | #define UCC_GETH_UPSMR_RMM 0x00001000 | 675 | #define UCC_GETH_UPSMR_RMM 0x00001000 |
| 676 | #define UCC_GETH_UPSMR_CAM 0x00000400 | 676 | #define UCC_GETH_UPSMR_CAM 0x00000400 |
| 677 | #define UCC_GETH_UPSMR_BRO 0x00000200 | 677 | #define UCC_GETH_UPSMR_BRO 0x00000200 |
| 678 | #define UCC_GETH_UPSMR_SMM 0x00000080 | ||
| 679 | #define UCC_GETH_UPSMR_SGMM 0x00000020 | ||
| 678 | 680 | ||
| 679 | /* UCC Transmit On Demand Register (UTODR) */ | 681 | /* UCC Transmit On Demand Register (UTODR) */ |
| 680 | #define UCC_SLOW_TOD 0x8000 | 682 | #define UCC_SLOW_TOD 0x8000 |