diff --git a/[refs] b/[refs] index 9bc9d0d07a8e..d9d48c711963 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ea180ca4d6fbeeb8f8bea4a175d2b84b9129b693 +refs/heads/master: 57f1e87523bdb6c39659ead7c0f72eea9e520fbe diff --git a/trunk/drivers/auxdisplay/cfag12864bfb.c b/trunk/drivers/auxdisplay/cfag12864bfb.c index fe3a865be4e5..b0ca5a47f47d 100644 --- a/trunk/drivers/auxdisplay/cfag12864bfb.c +++ b/trunk/drivers/auxdisplay/cfag12864bfb.c @@ -81,7 +81,7 @@ static struct fb_ops cfag12864bfb_ops = { .fb_mmap = cfag12864bfb_mmap, }; -static int __init cfag12864bfb_probe(struct platform_device *device) +static int __devinit cfag12864bfb_probe(struct platform_device *device) { int ret = -EINVAL; struct fb_info *info = framebuffer_alloc(0, &device->dev);