diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-03-13 16:32:54 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-03-13 16:33:03 +0100 |
| commit | ef15eda98217f5183f457e7a2de8b79555ef908b (patch) | |
| tree | f8f22b48f7bb237c9aa6646175f3e17eeac4af0e /drivers/video/intelfb | |
| parent | 5cb4ac3a583d4ee18c8682ab857e093c4a0d0895 (diff) | |
| parent | ef334a20d84f52407a8a2afd02ddeaecbef0ad3d (diff) | |
Merge branch 'x86/cleanups' into perf/uprobes
Merge reason: We want to merge a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/video/intelfb')
| -rw-r--r-- | drivers/video/intelfb/intelfbdrv.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c index c6afa33a453..02fd2263610 100644 --- a/drivers/video/intelfb/intelfbdrv.c +++ b/drivers/video/intelfb/intelfbdrv.c @@ -529,7 +529,6 @@ static int __devinit intelfb_pci_register(struct pci_dev *pdev, if (fb_alloc_cmap(&info->cmap, 256, 1) < 0) { ERR_MSG("Could not allocate cmap for intelfb_info.\n"); goto err_out_cmap; - return -ENODEV; } dinfo = info->par; |