diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2009-06-17 09:16:04 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-17 21:46:43 -0400 |
| commit | f3a32500ba8f3ec9ee0c12836fcfd315f1256db4 (patch) | |
| tree | fecc1148c135213d6f82130de46e6196e57a59a8 /arch | |
| parent | 603a8bbe62e54108055fca46ecdd611c10c6cd0a (diff) | |
Revert "net/ucc_geth: Add SGMII support for UEC GETH driver"
This reverts commit 047584ce94108012288554a5f84585d792cc7f8f.
This patch meshes badly with "net: Rework ucc_geth driver to use
of_mdio infrastructure" (0b9da337dca972e7a4144e298ec3adb8f244d4a4).
Since most of the patch needs to be reworked, it is clearer to revert
the patch and then apply the corrected version
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/include/asm/qe.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/qe.h b/arch/powerpc/include/asm/qe.h index 4459d20dc76a..2701753d9937 100644 --- a/arch/powerpc/include/asm/qe.h +++ b/arch/powerpc/include/asm/qe.h | |||
| @@ -668,8 +668,6 @@ struct ucc_slow_pram { | |||
| 668 | #define UCC_GETH_UPSMR_RMM 0x00001000 | 668 | #define UCC_GETH_UPSMR_RMM 0x00001000 |
| 669 | #define UCC_GETH_UPSMR_CAM 0x00000400 | 669 | #define UCC_GETH_UPSMR_CAM 0x00000400 |
| 670 | #define UCC_GETH_UPSMR_BRO 0x00000200 | 670 | #define UCC_GETH_UPSMR_BRO 0x00000200 |
| 671 | #define UCC_GETH_UPSMR_SMM 0x00000080 | ||
| 672 | #define UCC_GETH_UPSMR_SGMM 0x00000020 | ||
| 673 | 671 | ||
| 674 | /* UCC Transmit On Demand Register (UTODR) */ | 672 | /* UCC Transmit On Demand Register (UTODR) */ |
| 675 | #define UCC_SLOW_TOD 0x8000 | 673 | #define UCC_SLOW_TOD 0x8000 |