diff options
| author | Stefan Roese <sr@denx.de> | 2008-01-09 10:43:47 +0100 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2008-01-09 10:43:47 +0100 |
| commit | 1466ef8db57a2b52efd8c900dd37e7b3840dc263 (patch) | |
| tree | a81e87f5d4968652555d64d122bcfef01f6ce7c7 /include/ppc440.h | |
| parent | 1f84021a85abeb837d2ce0dc84297b4f1d45d516 (diff) | |
| parent | b2e2142c500c48a57f18f9dd30e66c13caea0971 (diff) | |
Merge branch 'lwmon5-no-ocm'
Diffstat (limited to 'include/ppc440.h')
| -rw-r--r-- | include/ppc440.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/ppc440.h b/include/ppc440.h index bfd1e1033..907744b87 100644 --- a/include/ppc440.h +++ b/include/ppc440.h @@ -1362,8 +1362,6 @@ #define plb1_bearl (PLB_ARBITER_BASE+ 0x0C) #define plb1_bearh (PLB_ARBITER_BASE+ 0x0D) -#if defined(CONFIG_440EP) || defined(CONFIG_440GR) || \ - defined(CONFIG_440EPX) || defined(CONFIG_440GRX) /* Pin Function Control Register 1 */ #define SDR0_PFC1 0x4101 #define SDR0_PFC1_U1ME_MASK 0x02000000 /* UART1 Mode Enable */ @@ -1429,7 +1427,7 @@ #define SDR0_MFR_PKT_REJ_EN1 0x00080000 /* Pkt Rej. Enable on EMAC3(1) */ #define SDR0_MFR_PKT_REJ_POL 0x00200000 /* Packet Reject Polarity */ -#endif /* defined(CONFIG_440EP) || defined(CONFIG_440GR) */ +#define GPT0_COMP6 0x00000098 #if defined(CONFIG_440EPX) || defined(CONFIG_440GRX) #define SDR0_USB2D0CR 0x0320 |