VIA module fixes:

1. Fixed up PCI-id's.
2. Fixed 2.6 warning in kernel Makefile.
main
Thomas Hellstrom 2004-03-31 22:05:57 +00:00
parent 20163c2b10
commit 994fa063cd
3 changed files with 5 additions and 10 deletions

View File

@ -19,8 +19,6 @@ ffb-objs := ffb_drv.o ffb_context.o
savage-objs := savage_drv.o savage_dma.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 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 # Kernel version checks
BELOW25 := $(shell if [ $(PATCHLEVEL) -lt 5 ]; then echo y; fi) 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-m :=
obj-n := obj-n :=
obj- := obj- :=
export-objs := via_mm.o
endif endif
obj-$(CONFIG_DRM_GAMMA) += gamma.o obj-$(CONFIG_DRM_GAMMA) += gamma.o

View File

@ -19,8 +19,6 @@ ffb-objs := ffb_drv.o ffb_context.o
savage-objs := savage_drv.o savage_dma.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 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 # Kernel version checks
BELOW25 := $(shell if [ $(PATCHLEVEL) -lt 5 ]; then echo y; fi) 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-m :=
obj-n := obj-n :=
obj- := obj- :=
export-objs := via_mm.o
endif endif
obj-$(CONFIG_DRM_GAMMA) += gamma.o obj-$(CONFIG_DRM_GAMMA) += gamma.o

View File

@ -53,12 +53,9 @@ extern int via_final_context(int context);
#define DRIVER_CTX_DTOR via_final_context #define DRIVER_CTX_DTOR via_final_context
#define DRIVER_PCI_IDS \ #define DRIVER_PCI_IDS \
{0x1106, 0x3122, 0, "Via CLE3122"}, \ {0x1106, 0x3122, 0, "VIA CLE266"}, \
{0x1106, 0x3022, 0, "Via CLE3022"}, \ {0x1106, 0x7205, 0, "VIA KM400"}, \
{0x1106, 0x3205, 0, "Via VT3205"}, \ {0x1106, 0x7204, 0, "VIA K8M800"}, \
{0x1106, 0x7205, 0, "Via VT7205"}, \
{0x1106, 0x3204, 0, "Via VT3204"}, \
{0x1106, 0x7204, 0, "Via VT7204"}, \
{0, 0, 0, NULL} {0, 0, 0, NULL}
#endif #endif