diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-06 18:35:18 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-06 18:35:18 -0400 |
| commit | 67d340f440f389e9d56201fb7c7aaa92f262feb1 (patch) | |
| tree | a96c26a370beb23282a561ddd936e5d0aa93adde /arch/ppc/syslib/ppc4xx_pic.c | |
| parent | 2ba3e3e65cf182436757ba13ea8d564e2950fb56 (diff) | |
| parent | 159f597a8bd0f1d7650d5e580c93a2666c9c26d1 (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/ppc/syslib/ppc4xx_pic.c')
| -rw-r--r-- | arch/ppc/syslib/ppc4xx_pic.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/ppc/syslib/ppc4xx_pic.c b/arch/ppc/syslib/ppc4xx_pic.c index 05686fa73545..40086212b9c3 100644 --- a/arch/ppc/syslib/ppc4xx_pic.c +++ b/arch/ppc/syslib/ppc4xx_pic.c | |||
| @@ -110,6 +110,10 @@ static int ppc4xx_pic_get_irq(struct pt_regs *regs) | |||
| 110 | 110 | ||
| 111 | static void __init ppc4xx_pic_impl_init(void) | 111 | static void __init ppc4xx_pic_impl_init(void) |
| 112 | { | 112 | { |
| 113 | #if defined(CONFIG_440GX) | ||
| 114 | /* Disable 440GP compatibility mode if it was enabled in firmware */ | ||
| 115 | SDR_WRITE(DCRN_SDR_MFR, SDR_READ(DCRN_SDR_MFR) & ~DCRN_SDR_MFR_PCM); | ||
| 116 | #endif | ||
| 113 | /* Configure Base UIC */ | 117 | /* Configure Base UIC */ |
| 114 | mtdcr(DCRN_UIC_CR(UICB), 0); | 118 | mtdcr(DCRN_UIC_CR(UICB), 0); |
| 115 | mtdcr(DCRN_UIC_TR(UICB), 0); | 119 | mtdcr(DCRN_UIC_TR(UICB), 0); |