Merge branch 'topic/powermac' into for-linus

diff --combined sound/ppc/powermac.c
index 2e18ed0ea899f893e04c939d891b5010759e4afc,e9b02d974350532cae70ebbce704f816b266a603..5a929069dce980453a67d526450b9cf877fb9d09
--- 1/sound/ppc/powermac.c
--- 2/sound/ppc/powermac.c
+++ b/sound/ppc/powermac.c
@@@ -58,9 -58,9 +58,9 @@@ static int __init snd_pmac_probe(struc
        char *name_ext;
        int err;
  
 -      card = snd_card_new(index, id, THIS_MODULE, 0);
 -      if (card == NULL)
 -              return -ENOMEM;
 +      err = snd_card_create(index, id, THIS_MODULE, 0, &card);
 +      if (err < 0)
 +              return err;
  
        if ((err = snd_pmac_new(card, &chip)) < 0)
                goto __error;
@@@ -110,7 -110,7 +110,7 @@@
                        goto __error;
                break;
        default:
-               snd_printk("unsupported hardware %d\n", chip->model);
+               snd_printk(KERN_ERR "unsupported hardware %d\n", chip->model);
                err = -EINVAL;
                goto __error;
        }