diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-30 01:57:46 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-30 01:57:46 +0200 |
| commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
| tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /sound/isa/gus/interwave.c | |
| parent | Pull acpica into release branch (diff) | |
| parent | [PATCH] usb gadget: fixup pxa2xx_udc to include asm/arch/udc.h again (diff) | |
| download | linux-d120cfb544ed6161b9d32fb6c4648c471807ee6b.tar.xz linux-d120cfb544ed6161b9d32fb6c4648c471807ee6b.zip | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'sound/isa/gus/interwave.c')
| -rw-r--r-- | sound/isa/gus/interwave.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/isa/gus/interwave.c b/sound/isa/gus/interwave.c index 866300f2acbb..c1c86e0fa56d 100644 --- a/sound/isa/gus/interwave.c +++ b/sound/isa/gus/interwave.c @@ -611,10 +611,10 @@ static int __devinit snd_interwave_pnp(int dev, struct snd_interwave *iwcard, if (dma2[dev] >= 0) dma2[dev] = pnp_dma(pdev, 1); irq[dev] = pnp_irq(pdev, 0); - snd_printdd("isapnp IW: sb port=0x%lx, gf1 port=0x%lx, codec port=0x%lx\n", - pnp_port_start(pdev, 0), - pnp_port_start(pdev, 1), - pnp_port_start(pdev, 2)); + snd_printdd("isapnp IW: sb port=0x%llx, gf1 port=0x%llx, codec port=0x%llx\n", + (unsigned long long)pnp_port_start(pdev, 0), + (unsigned long long)pnp_port_start(pdev, 1), + (unsigned long long)pnp_port_start(pdev, 2)); snd_printdd("isapnp IW: dma1=%i, dma2=%i, irq=%i\n", dma1[dev], dma2[dev], irq[dev]); #ifdef SNDRV_STB /* Tone Control initialization */ |