diff options
| author | Emil Velikov | 2011-03-20 00:31:52 +0100 |
|---|---|---|
| committer | Ben Skeggs | 2011-05-16 02:47:17 +0200 |
| commit | f212949ced2397b5f00e987bb5d4bb34dc69cc8d (patch) | |
| tree | c48bee8ffaff8b8d6ff753b9475da4e1c5727e76 /drivers/gpu/drm/nouveau/nouveau_state.c | |
| parent | drm/nouveau: Fix indentation-related checkpatch.pl error messages. (diff) | |
| download | kernel-qcow2-linux-f212949ced2397b5f00e987bb5d4bb34dc69cc8d.tar.gz kernel-qcow2-linux-f212949ced2397b5f00e987bb5d4bb34dc69cc8d.tar.xz kernel-qcow2-linux-f212949ced2397b5f00e987bb5d4bb34dc69cc8d.zip | |
drm/nouveau: Clean up trailing whitespace and C99-style comments.
Fix 'ERROR: trailing whitespace',
Fix 'ERROR: do not use C99 // comments'
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_state.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_state.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c index a30adec5beaa..e04c4b651955 100644 --- a/drivers/gpu/drm/nouveau/nouveau_state.c +++ b/drivers/gpu/drm/nouveau/nouveau_state.c @@ -861,7 +861,7 @@ static int nouveau_remove_conflicting_drivers(struct drm_device *dev) #ifdef CONFIG_X86 primary = dev->pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW; #endif - + remove_conflicting_framebuffers(dev_priv->apertures, "nouveaufb", primary); return 0; } |