diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-06-10 07:26:37 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-06-10 07:26:37 +0200 |
| commit | 8c3ff3a7fb9730564554bb65d54455e6ce8ad340 (patch) | |
| tree | e21bbdab8537678b85f9661ceb89f09989a9935b /sound/parisc/harmony.c | |
| parent | ed8cc176c9d3f8fbc2ddc18b75362be666e6d328 (diff) | |
| parent | ad0b0822f98ef547e2461ce463e4233bad7848a8 (diff) | |
Merge branch 'topic/misc' into for-linus
* topic/misc:
ALSA: sgio2audio.c: clean up checking
ALSA: burgundy: timeout message is off by one.
ALSA: bt87x - Add a quirk entry for Askey Computer Corp. MagicTView'99
ALSA: parisc/harmony: fix printk format warning
ALSA: keywest: Get rid of useless i2c_device_name() macro
Diffstat (limited to 'sound/parisc/harmony.c')
| -rw-r--r-- | sound/parisc/harmony.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/parisc/harmony.c b/sound/parisc/harmony.c index 6055fd6d3b3..63ae0f9aeaf 100644 --- 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; } |