diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-12 18:16:52 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-27 12:23:59 -0400 |
commit | 228aef63d9a5f4ddc9cc9213215e789f35f2cd00 (patch) | |
tree | b300c995e20f93ff03d9cc8a99f21e5cc44b8be6 /drivers/media/video/bt8xx | |
parent | 08f46de9a0e7c293db34cf44f9451d18ef609770 (diff) |
[PATCH] 64bit resource: fix up printks for resources in video drivers
This is needed if we wish to change the size of the resource structures.
Based on an original patch from Vivek Goyal <vgoyal@in.ibm.com>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/media/video/bt8xx')
-rw-r--r-- | drivers/media/video/bt8xx/bttv-driver.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c index 423e954948be..aa3203ae670c 100644 --- a/drivers/media/video/bt8xx/bttv-driver.c +++ b/drivers/media/video/bt8xx/bttv-driver.c | |||
@@ -4019,8 +4019,9 @@ static int __devinit bttv_probe(struct pci_dev *dev, | |||
4019 | if (!request_mem_region(pci_resource_start(dev,0), | 4019 | if (!request_mem_region(pci_resource_start(dev,0), |
4020 | pci_resource_len(dev,0), | 4020 | pci_resource_len(dev,0), |
4021 | btv->c.name)) { | 4021 | btv->c.name)) { |
4022 | printk(KERN_WARNING "bttv%d: can't request iomem (0x%lx).\n", | 4022 | printk(KERN_WARNING "bttv%d: can't request iomem (0x%llx).\n", |
4023 | btv->c.nr, pci_resource_start(dev,0)); | 4023 | btv->c.nr, |
4024 | (unsigned long long)pci_resource_start(dev,0)); | ||
4024 | return -EBUSY; | 4025 | return -EBUSY; |
4025 | } | 4026 | } |
4026 | pci_set_master(dev); | 4027 | pci_set_master(dev); |
@@ -4031,8 +4032,9 @@ static int __devinit bttv_probe(struct pci_dev *dev, | |||
4031 | pci_read_config_byte(dev, PCI_LATENCY_TIMER, &lat); | 4032 | pci_read_config_byte(dev, PCI_LATENCY_TIMER, &lat); |
4032 | printk(KERN_INFO "bttv%d: Bt%d (rev %d) at %s, ", | 4033 | printk(KERN_INFO "bttv%d: Bt%d (rev %d) at %s, ", |
4033 | bttv_num,btv->id, btv->revision, pci_name(dev)); | 4034 | bttv_num,btv->id, btv->revision, pci_name(dev)); |
4034 | printk("irq: %d, latency: %d, mmio: 0x%lx\n", | 4035 | printk("irq: %d, latency: %d, mmio: 0x%llx\n", |
4035 | btv->c.pci->irq, lat, pci_resource_start(dev,0)); | 4036 | btv->c.pci->irq, lat, |
4037 | (unsigned long long)pci_resource_start(dev,0)); | ||
4036 | schedule(); | 4038 | schedule(); |
4037 | 4039 | ||
4038 | btv->bt848_mmio=ioremap(pci_resource_start(dev,0), 0x1000); | 4040 | btv->bt848_mmio=ioremap(pci_resource_start(dev,0), 0x1000); |