summaryrefslogtreecommitdiffstats
path: root/drivers/video/cyber2000fb.h
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-08-01 11:18:29 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-02-11 11:16:06 +0100
commit24d6e5cb191189531396870402bf276aacf01598 (patch)
treefc10e45c665963b080b3e770e52bbef412600d95 /drivers/video/cyber2000fb.h
parentVIDEO: cyberpro: add support for video capture I2C (diff)
downloadlinux-24d6e5cb191189531396870402bf276aacf01598.tar.xz
linux-24d6e5cb191189531396870402bf276aacf01598.zip
VIDEO: cyberpro: update handling of device structures
Provide the framebuffer device with its correct parent (the PCI device for PCI connected cards.) Also, use this struct device to pass to sub-drivers rather than the pci_dev structure, which is really what they want. Also propagate the assigned IRQ, which they were getting direct from the PCI device structure. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/video/cyber2000fb.h')
-rw-r--r--drivers/video/cyber2000fb.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/cyber2000fb.h b/drivers/video/cyber2000fb.h
index 814cce5acf12..555c8d4f2b76 100644
--- a/drivers/video/cyber2000fb.h
+++ b/drivers/video/cyber2000fb.h
@@ -464,13 +464,14 @@ static void debug_printf(char *fmt, ...)
struct cfb_info;
struct cyberpro_info {
- struct pci_dev *dev;
+ struct device *dev;
struct i2c_adapter *i2c;
unsigned char __iomem *regs;
char __iomem *fb;
char dev_name[32];
unsigned int fb_size;
unsigned int chip_id;
+ unsigned int irq;
/*
* The following is a pointer to be passed into the