Merge branch 'hostprogs-wmissing-prototypes' of git://git.kernel.org/pub/scm/linux...

[mv-sheeva.git] / sound / oss / sb_common.c

diff --git a/sound/oss/sb_common.c b/sound/oss/sb_common.c
index 07cbacf63824602d3a2763984efc3368c5c0f4ad..ce4db49291f7862427fc74902970d8f78174049e 100644 (file)
--- a/sound/oss/sb_common.c
+++ b/sound/oss/sb_common.c
@@ -157,7 +157,7 @@ static void sb_intr (sb_devc *devc)
                                break;
 
                        default:
-                               /* printk(KERN_WARN "Sound Blaster: Unexpected interrupt\n"); */
+                               /* printk(KERN_WARNING "Sound Blaster: Unexpected interrupt\n"); */
                                ;
                }
        }
@@ -177,7 +177,7 @@ static void sb_intr (sb_devc *devc)
                                break;
 
                        default:
-                               /* printk(KERN_WARN "Sound Blaster: Unexpected interrupt\n"); */
+                               /* printk(KERN_WARNING "Sound Blaster: Unexpected interrupt\n"); */
                                ;
                }
        }
@@ -1228,7 +1228,8 @@ int probe_sbmpu(struct address_info *hw_config, struct module *owner)
                }
                attach_mpu401(hw_config, owner);
                if (last_sb->irq == -hw_config->irq)
-                       last_sb->midi_irq_cookie=(void *)hw_config->slots[1];
+                       last_sb->midi_irq_cookie =
+                               (void *)(long) hw_config->slots[1];
                return 1;
        }
 #endif