---

yaml --- r: 282670 b: refs/heads/master c: 7a6e0da h: refs/heads/master v: v3
git-mirror · Dec 21, 2011 · 646db28 · 646db28
1 parent 614fa29
commit 646db28
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 364 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be2fb9da32cb88a1311350de3d1db8f9e461ae9f
+refs/heads/master: 7a6e0daaf4058d1b7dd515bc470ec904454a798c
diff --git a/trunk/drivers/gpu/drm/Makefile b/trunk/drivers/gpu/drm/Makefile
@@ -9,7 +9,7 @@ drm-y       :=	drm_auth.o drm_buffer.o drm_bufs.o drm_cache.o \
 		drm_drv.o drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \
 		drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \
 		drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \
-		drm_platform.o drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o \
+		drm_platform.o drm_sysfs.o drm_hashtab.o drm_mm.o \
 		drm_crtc.o drm_modes.o drm_edid.o \
 		drm_info.o drm_debugfs.o drm_encoder_slave.o \
 		drm_trace_points.o drm_global.o drm_usb.o

diff --git a/trunk/drivers/gpu/drm/drm_sman.c b/trunk/drivers/gpu/drm/drm_sman.c
diff --git a/trunk/include/drm/drm_sman.h b/trunk/include/drm/drm_sman.h