summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux-core/Makefile.kernel3
-rw-r--r--linux/Makefile.kernel3
-rw-r--r--shared/via.h9
3 files changed, 5 insertions, 10 deletions
diff --git a/linux-core/Makefile.kernel b/linux-core/Makefile.kernel
index a69de3dd..bcb0f92c 100644
--- a/linux-core/Makefile.kernel
+++ b/linux-core/Makefile.kernel
@@ -19,8 +19,6 @@ ffb-objs := ffb_drv.o ffb_context.o
savage-objs := savage_drv.o savage_dma.o
via-objs := via_irq.o via_drv.o via_ds.o via_map.o via_mm.o
-export-objs := via_mm.o
-
# Kernel version checks
BELOW25 := $(shell if [ $(PATCHLEVEL) -lt 5 ]; then echo y; fi)
@@ -39,6 +37,7 @@ list-multi := gamma.o tdfx.o r128.o mga.o i810.o i830.o ffb.o radeon.o \
obj-m :=
obj-n :=
obj- :=
+export-objs := via_mm.o
endif
obj-$(CONFIG_DRM_GAMMA) += gamma.o
diff --git a/linux/Makefile.kernel b/linux/Makefile.kernel
index a69de3dd..bcb0f92c 100644
--- a/linux/Makefile.kernel
+++ b/linux/Makefile.kernel
@@ -19,8 +19,6 @@ ffb-objs := ffb_drv.o ffb_context.o
savage-objs := savage_drv.o savage_dma.o
via-objs := via_irq.o via_drv.o via_ds.o via_map.o via_mm.o
-export-objs := via_mm.o
-
# Kernel version checks
BELOW25 := $(shell if [ $(PATCHLEVEL) -lt 5 ]; then echo y; fi)
@@ -39,6 +37,7 @@ list-multi := gamma.o tdfx.o r128.o mga.o i810.o i830.o ffb.o radeon.o \
obj-m :=
obj-n :=
obj- :=
+export-objs := via_mm.o
endif
obj-$(CONFIG_DRM_GAMMA) += gamma.o
diff --git a/shared/via.h b/shared/via.h
index f7fabd7e..8e81e571 100644
--- a/shared/via.h
+++ b/shared/via.h
@@ -53,12 +53,9 @@ extern int via_final_context(int context);
#define DRIVER_CTX_DTOR via_final_context
#define DRIVER_PCI_IDS \
- {0x1106, 0x3122, 0, "Via CLE3122"}, \
- {0x1106, 0x3022, 0, "Via CLE3022"}, \
- {0x1106, 0x3205, 0, "Via VT3205"}, \
- {0x1106, 0x7205, 0, "Via VT7205"}, \
- {0x1106, 0x3204, 0, "Via VT3204"}, \
- {0x1106, 0x7204, 0, "Via VT7204"}, \
+ {0x1106, 0x3122, 0, "VIA CLE266"}, \
+ {0x1106, 0x7205, 0, "VIA KM400"}, \
+ {0x1106, 0x7204, 0, "VIA K8M800"}, \
{0, 0, 0, NULL}
#endif