diff options
author | Paul Mackerras <paulus@samba.org> | 2005-11-10 03:08:55 +0100 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-11-10 03:08:55 +0100 |
commit | e130bedb7ce718a8eb6b56a3806b96281f618111 (patch) | |
tree | da5676a4291a79b06da6fe2b005e0058ec03cc2c /arch/powerpc/platforms/pseries | |
parent | powerpc: Fix find_next_bit on 32-bit (diff) | |
parent | powerpc: merge irq.c (diff) | |
download | linux-e130bedb7ce718a8eb6b56a3806b96281f618111.tar.xz linux-e130bedb7ce718a8eb6b56a3806b96281f618111.zip |
Merge git://oak/home/sfr/kernels/iseries/work
Diffstat (limited to 'arch/powerpc/platforms/pseries')
-rw-r--r-- | arch/powerpc/platforms/pseries/xics.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c index c72c86f05cb6..405c4f3229b3 100644 --- a/arch/powerpc/platforms/pseries/xics.c +++ b/arch/powerpc/platforms/pseries/xics.c @@ -567,6 +567,7 @@ nextnode: xics_8259_pic.enable = i8259_pic.enable; xics_8259_pic.disable = i8259_pic.disable; + xics_8259_pic.end = i8259_pic.end; for (i = 0; i < 16; ++i) get_irq_desc(i)->handler = &xics_8259_pic; for (; i < NR_IRQS; ++i) |