diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
| commit | 23fd07750a789a66fe88cf173d52a18f1a387da4 (patch) | |
| tree | 06fdd6df35fdb835abdaa9b754d62f6b84b97250 /drivers/video/fbmem.c | |
| parent | bd787d438a59266af3c9f6351644c85ef1dd21fe (diff) | |
| parent | ed28f96ac1960f30f818374d65be71d2fdf811b0 (diff) | |
Merge ../linux-2.6 by hand
Diffstat (limited to 'drivers/video/fbmem.c')
| -rw-r--r-- | drivers/video/fbmem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c index ca02aa2bfcec..e2667ddab3f1 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c | |||
| @@ -1031,7 +1031,7 @@ register_framebuffer(struct fb_info *fb_info) | |||
| 1031 | break; | 1031 | break; |
| 1032 | fb_info->node = i; | 1032 | fb_info->node = i; |
| 1033 | 1033 | ||
| 1034 | fb_info->class_device = class_device_create(fb_class, MKDEV(FB_MAJOR, i), | 1034 | fb_info->class_device = class_device_create(fb_class, NULL, MKDEV(FB_MAJOR, i), |
| 1035 | fb_info->device, "fb%d", i); | 1035 | fb_info->device, "fb%d", i); |
| 1036 | if (IS_ERR(fb_info->class_device)) { | 1036 | if (IS_ERR(fb_info->class_device)) { |
| 1037 | /* Not fatal */ | 1037 | /* Not fatal */ |