diff options
Diffstat (limited to 'arch/ppc/platforms/pplus.c')
-rw-r--r-- | arch/ppc/platforms/pplus.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/ppc/platforms/pplus.c b/arch/ppc/platforms/pplus.c index 65705c911795..93e9c7b889f7 100644 --- a/arch/ppc/platforms/pplus.c +++ b/arch/ppc/platforms/pplus.c | |||
@@ -647,14 +647,6 @@ static void pplus_power_off(void) | |||
647 | pplus_halt(); | 647 | pplus_halt(); |
648 | } | 648 | } |
649 | 649 | ||
650 | static unsigned int pplus_irq_canonicalize(u_int irq) | ||
651 | { | ||
652 | if (irq == 2) | ||
653 | return 9; | ||
654 | else | ||
655 | return irq; | ||
656 | } | ||
657 | |||
658 | static void __init pplus_init_IRQ(void) | 650 | static void __init pplus_init_IRQ(void) |
659 | { | 651 | { |
660 | int i; | 652 | int i; |
@@ -873,10 +865,10 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5, | |||
873 | ISA_DMA_THRESHOLD = 0x00ffffff; | 865 | ISA_DMA_THRESHOLD = 0x00ffffff; |
874 | DMA_MODE_READ = 0x44; | 866 | DMA_MODE_READ = 0x44; |
875 | DMA_MODE_WRITE = 0x48; | 867 | DMA_MODE_WRITE = 0x48; |
868 | ppc_do_canonicalize_irqs = 1; | ||
876 | 869 | ||
877 | ppc_md.setup_arch = pplus_setup_arch; | 870 | ppc_md.setup_arch = pplus_setup_arch; |
878 | ppc_md.show_cpuinfo = pplus_show_cpuinfo; | 871 | ppc_md.show_cpuinfo = pplus_show_cpuinfo; |
879 | ppc_md.irq_canonicalize = pplus_irq_canonicalize; | ||
880 | ppc_md.init_IRQ = pplus_init_IRQ; | 872 | ppc_md.init_IRQ = pplus_init_IRQ; |
881 | /* this gets changed later on if we have an OpenPIC -- Cort */ | 873 | /* this gets changed later on if we have an OpenPIC -- Cort */ |
882 | ppc_md.get_irq = i8259_irq; | 874 | ppc_md.get_irq = i8259_irq; |