Merge branch 'master' of /home/sam/kernel/linux-2.6/

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/sparc64/kernel/sbus.c b/arch/sparc64/kernel/sbus.c
index ef68aa4fec65..c49a57795743 100644
--- a/arch/sparc64/kernel/sbus.c
+++ b/arch/sparc64/kernel/sbus.c
@@ -1065,7 +1065,7 @@ static void __init sysio_register_error_handlers(struct sbus_bus *sbus)
 
         irq = sbus_build_irq(sbus, SYSIO_UE_INO);
         if (request_irq(irq, sysio_ue_handler,
-                        SA_SHIRQ, "SYSIO UE", sbus) < 0) {
+                        IRQF_SHARED, "SYSIO UE", sbus) < 0) {
                 prom_printf("SYSIO[%x]: Cannot register UE interrupt.\n",
                             sbus->portid);
                 prom_halt();
@@ -1073,7 +1073,7 @@ static void __init sysio_register_error_handlers(struct sbus_bus *sbus)
 
         irq = sbus_build_irq(sbus, SYSIO_CE_INO);
         if (request_irq(irq, sysio_ce_handler,
-                        SA_SHIRQ, "SYSIO CE", sbus) < 0) {
+                        IRQF_SHARED, "SYSIO CE", sbus) < 0) {
                 prom_printf("SYSIO[%x]: Cannot register CE interrupt.\n",
                             sbus->portid);
                 prom_halt();
@@ -1081,7 +1081,7 @@ static void __init sysio_register_error_handlers(struct sbus_bus *sbus)
 
         irq = sbus_build_irq(sbus, SYSIO_SBUSERR_INO);
         if (request_irq(irq, sysio_sbus_error_handler,
-                        SA_SHIRQ, "SYSIO SBUS Error", sbus) < 0) {
+                        IRQF_SHARED, "SYSIO SBUS Error", sbus) < 0) {
                 prom_printf("SYSIO[%x]: Cannot register SBUS Error interrupt.\n",
                             sbus->portid);
                 prom_halt();