diff options
author | Jody McIntyre <scjody@modernduck.com> | 2005-11-18 15:16:15 -0500 |
---|---|---|
committer | Jody McIntyre <scjody@modernduck.com> | 2005-11-18 15:16:15 -0500 |
commit | 35267ab61f0bf7a867ac87e19714b858d08d440a (patch) | |
tree | db84140a40b22208fe2a598fa233c26e79eb6465 /include/asm-ppc/cpm2.h | |
parent | a9931a6e37c09f6b76a9fa0cbd777c335548692b (diff) | |
parent | 8907e94be2661be940c622232d6ce5ae938f10c3 (diff) |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-ppc/cpm2.h')
-rw-r--r-- | include/asm-ppc/cpm2.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-ppc/cpm2.h b/include/asm-ppc/cpm2.h index 43d2ebbc7748..b638b87cebe3 100644 --- a/include/asm-ppc/cpm2.h +++ b/include/asm-ppc/cpm2.h | |||
@@ -1091,5 +1091,7 @@ typedef struct im_idma { | |||
1091 | #define CPM_IMMR_OFFSET 0x101a8 | 1091 | #define CPM_IMMR_OFFSET 0x101a8 |
1092 | #endif | 1092 | #endif |
1093 | 1093 | ||
1094 | #define FCC_PSMR_RMII ((uint)0x00020000) /* Use RMII interface */ | ||
1095 | |||
1094 | #endif /* __CPM2__ */ | 1096 | #endif /* __CPM2__ */ |
1095 | #endif /* __KERNEL__ */ | 1097 | #endif /* __KERNEL__ */ |