Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 198344
b: refs/heads/master
c: a8ce4be
h: refs/heads/master
v: v3
  • Loading branch information
Henrik Kretzschmar authored and Linus Torvalds committed May 25, 2010
1 parent 575ef65 commit 6846c43
Show file tree
Hide file tree
Showing 2 changed files with 6 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: e88a0f461aeadfe309d36a2a4fac9ffb1b0ed651
refs/heads/master: a8ce4be7d5b99a6338e695b26358abca329735c1
10 changes: 5 additions & 5 deletions trunk/drivers/video/s3c2410fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -631,7 +631,7 @@ static struct fb_ops s3c2410fb_ops = {
* cache. Once this area is remapped, all virtual memory
* access to the video memory should occur at the new region.
*/
static int __init s3c2410fb_map_video_memory(struct fb_info *info)
static int __devinit s3c2410fb_map_video_memory(struct fb_info *info)
{
struct s3c2410fb_info *fbi = info->par;
dma_addr_t map_dma;
Expand Down Expand Up @@ -814,7 +814,7 @@ static inline void s3c2410fb_cpufreq_deregister(struct s3c2410fb_info *info)

static char driver_name[] = "s3c2410fb";

static int __init s3c24xxfb_probe(struct platform_device *pdev,
static int __devinit s3c24xxfb_probe(struct platform_device *pdev,
enum s3c_drv_type drv_type)
{
struct s3c2410fb_info *info;
Expand Down Expand Up @@ -1018,7 +1018,7 @@ static int __devinit s3c2412fb_probe(struct platform_device *pdev)
/*
* Cleanup
*/
static int s3c2410fb_remove(struct platform_device *pdev)
static int __devexit s3c2410fb_remove(struct platform_device *pdev)
{
struct fb_info *fbinfo = platform_get_drvdata(pdev);
struct s3c2410fb_info *info = fbinfo->par;
Expand Down Expand Up @@ -1096,7 +1096,7 @@ static int s3c2410fb_resume(struct platform_device *dev)

static struct platform_driver s3c2410fb_driver = {
.probe = s3c2410fb_probe,
.remove = s3c2410fb_remove,
.remove = __devexit_p(s3c2410fb_remove),
.suspend = s3c2410fb_suspend,
.resume = s3c2410fb_resume,
.driver = {
Expand All @@ -1107,7 +1107,7 @@ static struct platform_driver s3c2410fb_driver = {

static struct platform_driver s3c2412fb_driver = {
.probe = s3c2412fb_probe,
.remove = s3c2410fb_remove,
.remove = __devexit_p(s3c2410fb_remove),
.suspend = s3c2410fb_suspend,
.resume = s3c2410fb_resume,
.driver = {
Expand Down

0 comments on commit 6846c43

Please sign in to comment.