Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 187073
b: refs/heads/master
c: c2e1303
h: refs/heads/master
i:
  187071: dcf62c0
v: v3
  • Loading branch information
Uwe Kleine-König authored and Greg Kroah-Hartman committed Mar 8, 2010
1 parent 5f3f64a commit 6da9bee
Show file tree
Hide file tree
Showing 18 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1b07193b34c1bc1c184e2d53a62633a73ea9b0a0
refs/heads/master: c2e13037e6794bd0d9de3f9ecabf5615f15c160b
2 changes: 1 addition & 1 deletion trunk/drivers/video/acornfb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1221,7 +1221,7 @@ free_unused_pages(unsigned int virtual_start, unsigned int virtual_end)
printk("acornfb: freed %dK memory\n", mb_freed);
}

static int __init acornfb_probe(struct platform_device *dev)
static int __devinit acornfb_probe(struct platform_device *dev)
{
unsigned long size;
u_int h_sync, v_sync;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/video/arcfb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ static struct fb_ops arcfb_ops = {
.fb_ioctl = arcfb_ioctl,
};

static int __init arcfb_probe(struct platform_device *dev)
static int __devinit arcfb_probe(struct platform_device *dev)
{
struct fb_info *info;
int retval = -ENOMEM;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/video/cobalt_lcdfb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ static struct fb_ops cobalt_lcd_fbops = {
.fb_cursor = cobalt_lcdfb_cursor,
};

static int __init cobalt_lcdfb_probe(struct platform_device *dev)
static int __devinit cobalt_lcdfb_probe(struct platform_device *dev)
{
struct fb_info *info;
struct resource *res;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/video/efifb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ static int __init efifb_setup(char *options)
return 0;
}

static int __init efifb_probe(struct platform_device *dev)
static int __devinit efifb_probe(struct platform_device *dev)
{
struct fb_info *info;
int err;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/video/epson1355fb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,7 @@ static int epson1355fb_remove(struct platform_device *dev)
return 0;
}

int __init epson1355fb_probe(struct platform_device *dev)
int __devinit epson1355fb_probe(struct platform_device *dev)
{
struct epson1355_par *default_par;
struct fb_info *info;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/video/gbefb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1128,7 +1128,7 @@ static int __init gbefb_setup(char *options)
return 0;
}

static int __init gbefb_probe(struct platform_device *p_dev)
static int __devinit gbefb_probe(struct platform_device *p_dev)
{
int i, ret = 0;
struct fb_info *info;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/video/hgafb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,7 @@ static struct fb_ops hgafb_ops = {
* Initialization
*/

static int __init hgafb_probe(struct platform_device *pdev)
static int __devinit hgafb_probe(struct platform_device *pdev)
{
struct fb_info *info;

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/video/hitfb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ static struct fb_ops hitfb_ops = {
.fb_imageblit = cfb_imageblit,
};

static int __init hitfb_probe(struct platform_device *dev)
static int __devinit hitfb_probe(struct platform_device *dev)
{
unsigned short lcdclor, ldr3, ldvndr;
struct fb_info *info;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/video/q40fb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ static struct fb_ops q40fb_ops = {
.fb_imageblit = cfb_imageblit,
};

static int __init q40fb_probe(struct platform_device *dev)
static int __devinit q40fb_probe(struct platform_device *dev)
{
struct fb_info *info;

Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/video/s3c2410fb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1004,12 +1004,12 @@ static int __init s3c24xxfb_probe(struct platform_device *pdev,
return ret;
}

static int __init s3c2410fb_probe(struct platform_device *pdev)
static int __devinit s3c2410fb_probe(struct platform_device *pdev)
{
return s3c24xxfb_probe(pdev, DRV_S3C2410);
}

static int __init s3c2412fb_probe(struct platform_device *pdev)
static int __devinit s3c2412fb_probe(struct platform_device *pdev)
{
return s3c24xxfb_probe(pdev, DRV_S3C2412);
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/video/sa1100fb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1435,7 +1435,7 @@ static struct sa1100fb_info * __init sa1100fb_init_fbinfo(struct device *dev)
return fbi;
}

static int __init sa1100fb_probe(struct platform_device *pdev)
static int __devinit sa1100fb_probe(struct platform_device *pdev)
{
struct sa1100fb_info *fbi;
int ret, irq;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/video/sgivwfb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -745,7 +745,7 @@ int __init sgivwfb_setup(char *options)
/*
* Initialisation
*/
static int __init sgivwfb_probe(struct platform_device *dev)
static int __devinit sgivwfb_probe(struct platform_device *dev)
{
struct sgivw_par *par;
struct fb_info *info;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/video/sh_mobile_lcdcfb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -943,7 +943,7 @@ static const struct dev_pm_ops sh_mobile_lcdc_dev_pm_ops = {

static int sh_mobile_lcdc_remove(struct platform_device *pdev);

static int __init sh_mobile_lcdc_probe(struct platform_device *pdev)
static int __devinit sh_mobile_lcdc_probe(struct platform_device *pdev)
{
struct fb_info *info;
struct sh_mobile_lcdc_priv *priv;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/video/vesafb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ static int __init vesafb_setup(char *options)
return 0;
}

static int __init vesafb_probe(struct platform_device *dev)
static int __devinit vesafb_probe(struct platform_device *dev)
{
struct fb_info *info;
int i, err;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/video/vfb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ static int __init vfb_setup(char *options)
* Initialisation
*/

static int __init vfb_probe(struct platform_device *dev)
static int __devinit vfb_probe(struct platform_device *dev)
{
struct fb_info *info;
int retval = -ENOMEM;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/video/vga16fb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1293,7 +1293,7 @@ static int vga16fb_setup(char *options)
}
#endif

static int __init vga16fb_probe(struct platform_device *dev)
static int __devinit vga16fb_probe(struct platform_device *dev)
{
struct fb_info *info;
struct vga16fb_par *par;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/video/w100fb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@ static int w100fb_resume(struct platform_device *dev)
#endif


int __init w100fb_probe(struct platform_device *pdev)
int __devinit w100fb_probe(struct platform_device *pdev)
{
int err = -EIO;
struct w100fb_mach_info *inf;
Expand Down

0 comments on commit 6da9bee

Please sign in to comment.