diff options
| author | Nian Wu <nian.wu@intel.com> | 2007-03-27 12:53:13 +0800 |
|---|---|---|
| committer | Nian Wu <nian.wu@intel.com> | 2007-03-27 12:53:13 +0800 |
| commit | 406a894e529267177e6161c1713f2aa2293e7734 (patch) | |
| tree | ddec9c8bca52bd4d5b6d65f8b85c10760e3c783f /linux-core | |
| parent | ddc87d302526347f670e8b61e227c0eb05c15cde (diff) | |
| parent | 674cefd4fe4b537a20a10edcb4ec5df55facca8e (diff) | |
Merge git://proxy01.pd.intel.com:9419/git/mesa/drm into crestline
Diffstat (limited to 'linux-core')
| -rw-r--r-- | linux-core/Makefile.kernel | 6 | ||||
| l--------- | linux-core/nv04_fb.c | 1 | ||||
| l--------- | linux-core/nv04_mc.c | 1 | ||||
| l--------- | linux-core/nv04_timer.c | 1 | ||||
| l--------- | linux-core/nv10_fb.c | 1 | ||||
| l--------- | linux-core/nv40_fb.c | 1 | ||||
| l--------- | linux-core/nv40_mc.c | 1 |
7 files changed, 11 insertions, 1 deletions
diff --git a/linux-core/Makefile.kernel b/linux-core/Makefile.kernel index 81a94331..6f5b021b 100644 --- a/linux-core/Makefile.kernel +++ b/linux-core/Makefile.kernel @@ -21,7 +21,11 @@ i810-objs := i810_drv.o i810_dma.o i915-objs := i915_drv.o i915_dma.o i915_irq.o i915_mem.o i915_fence.o \ i915_buffer.o nouveau-objs := nouveau_drv.o nouveau_state.o nouveau_fifo.o nouveau_mem.o \ - nouveau_object.o nouveau_irq.o nv04_graph.o nv10_graph.o nv20_graph.o nv30_graph.o \ + nouveau_object.o nouveau_irq.o \ + nv04_timer.o \ + nv04_mc.o nv40_mc.o \ + nv04_fb.o nv10_fb.o nv40_fb.o \ + nv04_graph.o nv10_graph.o nv20_graph.o nv30_graph.o \ nv40_graph.o radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o r300_cmdbuf.o sis-objs := sis_drv.o sis_mm.o diff --git a/linux-core/nv04_fb.c b/linux-core/nv04_fb.c new file mode 120000 index 00000000..867e2007 --- /dev/null +++ b/linux-core/nv04_fb.c @@ -0,0 +1 @@ +../shared-core/nv04_fb.c
\ No newline at end of file diff --git a/linux-core/nv04_mc.c b/linux-core/nv04_mc.c new file mode 120000 index 00000000..32e91825 --- /dev/null +++ b/linux-core/nv04_mc.c @@ -0,0 +1 @@ +../shared-core/nv04_mc.c
\ No newline at end of file diff --git a/linux-core/nv04_timer.c b/linux-core/nv04_timer.c new file mode 120000 index 00000000..11108b2b --- /dev/null +++ b/linux-core/nv04_timer.c @@ -0,0 +1 @@ +../shared-core/nv04_timer.c
\ No newline at end of file diff --git a/linux-core/nv10_fb.c b/linux-core/nv10_fb.c new file mode 120000 index 00000000..f858c7c6 --- /dev/null +++ b/linux-core/nv10_fb.c @@ -0,0 +1 @@ +../shared-core/nv10_fb.c
\ No newline at end of file diff --git a/linux-core/nv40_fb.c b/linux-core/nv40_fb.c new file mode 120000 index 00000000..4a816b13 --- /dev/null +++ b/linux-core/nv40_fb.c @@ -0,0 +1 @@ +../shared-core/nv40_fb.c
\ No newline at end of file diff --git a/linux-core/nv40_mc.c b/linux-core/nv40_mc.c new file mode 120000 index 00000000..fff26494 --- /dev/null +++ b/linux-core/nv40_mc.c @@ -0,0 +1 @@ +../shared-core/nv40_mc.c
\ No newline at end of file |