Merge branch 'topic/section-fix' into for-linus

[sfrench/cifs-2.6.git] / sound / parisc / harmony.c

diff --git a/sound/parisc/harmony.c b/sound/parisc/harmony.c
index 6055fd6d3b38ee90ba6d19895363ef33db38f275..e924492df21dc1b469f7b41020ca890737fa9857 100644 (file)
--- a/sound/parisc/harmony.c
+++ b/sound/parisc/harmony.c
@@ -935,7 +935,7 @@ snd_harmony_create(struct snd_card *card,
        h->iobase = ioremap_nocache(padev->hpa.start, HARMONY_SIZE);
        if (h->iobase == NULL) {
                printk(KERN_ERR PFX "unable to remap hpa 0x%lx\n",
-                      padev->hpa.start);
+                      (unsigned long)padev->hpa.start);
                err = -EBUSY;
                goto free_and_ret;
        }
@@ -1020,7 +1020,7 @@ static struct parisc_driver snd_harmony_driver = {
        .name = "harmony",
        .id_table = snd_harmony_devtable,
        .probe = snd_harmony_probe,
-       .remove = snd_harmony_remove,
+       .remove = __devexit_p(snd_harmony_remove),
 };
 
 static int __init