X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fvideo%2Fkyro%2Ffbdev.c;h=1cf2208c8af879f619b91e895ae6fb7efd63d083;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=2352a9142a77aeb3255dbc1cac0bc1a06aaf9655;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git

diff --git a/drivers/video/kyro/fbdev.c b/drivers/video/kyro/fbdev.c
index 2352a9142..1cf2208c8 100644
--- a/drivers/video/kyro/fbdev.c
+++ b/drivers/video/kyro/fbdev.c
@@ -76,7 +76,7 @@ static struct fb_var_screeninfo kyro_var __initdata = {
 static struct kyrofb_info *currentpar;
 
 typedef struct {
-	STG4000REG *pSTGReg;	/* Virtual address of PCI register region */
+	STG4000REG __iomem *pSTGReg;	/* Virtual address of PCI register region */
 	u32 ulNextFreeVidMem;	/* Offset from start of vid mem to next free region */
 	u32 ulOverlayOffset;	/* Offset from start of vid mem to overlay */
 	u32 ulOverlayStride;	/* Interleaved YUV and 422 mode Y stride */
@@ -735,6 +735,7 @@ static int __devinit kyrofb_probe(struct pci_dev *pdev,
 
 	fb_memset(info->screen_base, 0, size);
 
+	info->device = &pdev->dev;
 	if (register_framebuffer(info) < 0)
 		goto out_unmap;