Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 56888
b: refs/heads/master
c: a01fbbd
h: refs/heads/master
v: v3
  • Loading branch information
Richard Purdie authored and Linus Torvalds committed May 24, 2007
1 parent 8351977 commit e734636
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2686ba894bfedcacbe1b5197c574f3f1e66f2fda
refs/heads/master: a01fbbd52e4faf5971856c011e87ec6571b62840
14 changes: 9 additions & 5 deletions trunk/drivers/video/w100fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,7 @@ int __init w100fb_probe(struct platform_device *pdev)
err = -ENODEV;
goto out;
}
printk(" at 0x%08lx.\n", mem->start+W100_CFG_BASE);
printk(" at 0x%08lx.\n", (unsigned long) mem->start+W100_CFG_BASE);

/* Remap the framebuffer */
remapped_fbuf = ioremap_nocache(mem->start+MEM_WINDOW_BASE, MEM_WINDOW_SIZE);
Expand Down Expand Up @@ -753,10 +753,14 @@ int __init w100fb_probe(struct platform_device *pdev)
goto out;
}

device_create_file(&pdev->dev, &dev_attr_fastpllclk);
device_create_file(&pdev->dev, &dev_attr_reg_read);
device_create_file(&pdev->dev, &dev_attr_reg_write);
device_create_file(&pdev->dev, &dev_attr_flip);
err = device_create_file(&pdev->dev, &dev_attr_fastpllclk);
err |= device_create_file(&pdev->dev, &dev_attr_reg_read);
err |= device_create_file(&pdev->dev, &dev_attr_reg_write);
err |= device_create_file(&pdev->dev, &dev_attr_flip);

if (err != 0)
printk(KERN_WARNING "fb%d: failed to register attributes (%d)\n",
info->node, err);

printk(KERN_INFO "fb%d: %s frame buffer device\n", info->node, info->fix.id);
return 0;
Expand Down

0 comments on commit e734636

Please sign in to comment.