diff options
author | Paul Mackerras <paulus@samba.org> | 2008-04-24 20:57:20 +1000 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-04-24 20:57:20 +1000 |
commit | 36a23fc8aa0c72ecafe7aaee0a823b03b301e1df (patch) | |
tree | 364aa8cf248b477d822d0344d7bba3c80f86cf9c /arch/ppc/syslib/m8260_setup.c | |
parent | 23386fe572028ca0f9249fb3c71ed31b54cf1665 (diff) | |
parent | fc215fe7e6f0420afee0e0987fcc311929ee662f (diff) |
Merge branch 'powerpc-next' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
Diffstat (limited to 'arch/ppc/syslib/m8260_setup.c')
-rw-r--r-- | arch/ppc/syslib/m8260_setup.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/ppc/syslib/m8260_setup.c b/arch/ppc/syslib/m8260_setup.c index 46588fa9438..b40583724de 100644 --- a/arch/ppc/syslib/m8260_setup.c +++ b/arch/ppc/syslib/m8260_setup.c @@ -175,12 +175,6 @@ m8260_init_IRQ(void) * in case the boot rom changed something on us. */ cpm2_immr->im_intctl.ic_siprr = 0x05309770; - -#if defined(CONFIG_PCI) && (defined(CONFIG_ADS8272) || defined(CONFIG_PQ2FADS)) - /* Initialize stuff for the 82xx CPLD IC and install demux */ - pq2pci_init_irq(); -#endif - } /* |