Merge with Linux 2.4.0-test6-pre10.

7 files changed, 73 insertions, 99 deletions

diff --git a/include/linux/blk.h b/include/linux/blk.h
index ce00d0602..778617529 100644
--- a/include/linux/blk.h
+++ b/include/linux/blk.h
@@ -85,7 +85,7 @@ void initrd_init(void);
  * code duplication in drivers.
  */
 
-extern inline void blkdev_dequeue_request(struct request * req)
+static inline void blkdev_dequeue_request(struct request * req)
 {
 	if (req->e) {
 		req->e->dequeue_fn(req);
@@ -99,6 +99,9 @@ void end_that_request_last(struct request *req);
 
 #if defined(MAJOR_NR) || defined(IDE_DRIVER)
 
+#undef DEVICE_ON
+#undef DEVICE_OFF
+
 /*
  * Add entries as needed.
  */
@@ -106,8 +109,6 @@ void end_that_request_last(struct request *req);
 #ifdef IDE_DRIVER
 
 #define DEVICE_NR(device)	(MINOR(device) >> PARTN_BITS)
-#define DEVICE_ON(device)	/* nothing */
-#define DEVICE_OFF(device)	/* nothing */
 #define DEVICE_NAME "ide"
 
 #elif (MAJOR_NR == RAMDISK_MAJOR)
@@ -116,8 +117,6 @@ void end_that_request_last(struct request *req);
 #define DEVICE_NAME "ramdisk"
 #define DEVICE_REQUEST rd_request
 #define DEVICE_NR(device) (MINOR(device))
-#define DEVICE_ON(device) 
-#define DEVICE_OFF(device)
 #define DEVICE_NO_RANDOM
 
 #elif (MAJOR_NR == Z2RAM_MAJOR)
@@ -126,8 +125,6 @@ void end_that_request_last(struct request *req);
 #define DEVICE_NAME "Z2RAM"
 #define DEVICE_REQUEST do_z2_request
 #define DEVICE_NR(device) (MINOR(device))
-#define DEVICE_ON(device)
-#define DEVICE_OFF(device)
 
 #elif (MAJOR_NR == FLOPPY_MAJOR)
 
@@ -137,7 +134,6 @@ static void floppy_off(unsigned int nr);
 #define DEVICE_INTR do_floppy
 #define DEVICE_REQUEST do_fd_request
 #define DEVICE_NR(device) ( (MINOR(device) & 3) | ((MINOR(device) & 0x80 ) >> 5 ))
-#define DEVICE_ON(device)
 #define DEVICE_OFF(device) floppy_off(DEVICE_NR(device))
 
 #elif (MAJOR_NR == HD_MAJOR)
@@ -148,16 +144,12 @@ static void floppy_off(unsigned int nr);
 #define TIMEOUT_VALUE (6*HZ)
 #define DEVICE_REQUEST do_hd_request
 #define DEVICE_NR(device) (MINOR(device)>>6)
-#define DEVICE_ON(device)
-#define DEVICE_OFF(device)
 
 #elif (SCSI_DISK_MAJOR(MAJOR_NR))
 
 #define DEVICE_NAME "scsidisk"
 #define TIMEOUT_VALUE (2*HZ)
 #define DEVICE_NR(device) (((MAJOR(device) & SD_MAJOR_MASK) << (8 - 4)) + (MINOR(device) >> 4))
-#define DEVICE_ON(device)
-#define DEVICE_OFF(device)
 
 /* Kludge to use the same number for both char and block major numbers */
 #elif  (MAJOR_NR == MD_MAJOR) && defined(MD_DRIVER)
@@ -165,47 +157,35 @@ static void floppy_off(unsigned int nr);
 #define DEVICE_NAME "Multiple devices driver"
 #define DEVICE_REQUEST do_md_request
 #define DEVICE_NR(device) (MINOR(device))
-#define DEVICE_ON(device)
-#define DEVICE_OFF(device)
 
 #elif (MAJOR_NR == SCSI_TAPE_MAJOR)
 
 #define DEVICE_NAME "scsitape"
 #define DEVICE_INTR do_st  
 #define DEVICE_NR(device) (MINOR(device) & 0x7f)
-#define DEVICE_ON(device)
-#define DEVICE_OFF(device)
 
 #elif (MAJOR_NR == SCSI_CDROM_MAJOR)
 
 #define DEVICE_NAME "CD-ROM"
 #define DEVICE_NR(device) (MINOR(device))
-#define DEVICE_ON(device)
-#define DEVICE_OFF(device)
 
 #elif (MAJOR_NR == XT_DISK_MAJOR)
 
 #define DEVICE_NAME "xt disk"
 #define DEVICE_REQUEST do_xd_request
 #define DEVICE_NR(device) (MINOR(device) >> 6)
-#define DEVICE_ON(device)
-#define DEVICE_OFF(device)
 
 #elif (MAJOR_NR == PS2ESDI_MAJOR)
 
 #define DEVICE_NAME "PS/2 ESDI"
 #define DEVICE_REQUEST do_ps2esdi_request
 #define DEVICE_NR(device) (MINOR(device) >> 6)
-#define DEVICE_ON(device)
-#define DEVICE_OFF(device)
 
 #elif (MAJOR_NR == CDU31A_CDROM_MAJOR)
 
 #define DEVICE_NAME "CDU31A"
 #define DEVICE_REQUEST do_cdu31a_request
 #define DEVICE_NR(device) (MINOR(device))
-#define DEVICE_ON(device)
-#define DEVICE_OFF(device)
 
 #elif (MAJOR_NR == ACSI_MAJOR) && (defined(CONFIG_ATARI_ACSI) || defined(CONFIG_ATARI_ACSI_MODULE))
 
@@ -213,8 +193,6 @@ static void floppy_off(unsigned int nr);
 #define DEVICE_INTR do_acsi
 #define DEVICE_REQUEST do_acsi_request
 #define DEVICE_NR(device) (MINOR(device) >> 4)
-#define DEVICE_ON(device)
-#define DEVICE_OFF(device)
 
 #elif (MAJOR_NR == MITSUMI_CDROM_MAJOR)
 
@@ -222,8 +200,6 @@ static void floppy_off(unsigned int nr);
 /* #define DEVICE_INTR do_mcd */
 #define DEVICE_REQUEST do_mcd_request
 #define DEVICE_NR(device) (MINOR(device))
-#define DEVICE_ON(device)
-#define DEVICE_OFF(device)
 
 #elif (MAJOR_NR == MITSUMI_X_CDROM_MAJOR)
 
@@ -231,48 +207,36 @@ static void floppy_off(unsigned int nr);
 /* #define DEVICE_INTR do_mcdx */
 #define DEVICE_REQUEST do_mcdx_request
 #define DEVICE_NR(device) (MINOR(device))
-#define DEVICE_ON(device)
-#define DEVICE_OFF(device)
 
 #elif (MAJOR_NR == MATSUSHITA_CDROM_MAJOR)
 
 #define DEVICE_NAME "Matsushita CD-ROM controller #1"
 #define DEVICE_REQUEST do_sbpcd_request
 #define DEVICE_NR(device) (MINOR(device))
-#define DEVICE_ON(device)
-#define DEVICE_OFF(device)
 
 #elif (MAJOR_NR == MATSUSHITA_CDROM2_MAJOR)
 
 #define DEVICE_NAME "Matsushita CD-ROM controller #2"
 #define DEVICE_REQUEST do_sbpcd2_request
 #define DEVICE_NR(device) (MINOR(device))
-#define DEVICE_ON(device)
-#define DEVICE_OFF(device)
 
 #elif (MAJOR_NR == MATSUSHITA_CDROM3_MAJOR)
 
 #define DEVICE_NAME "Matsushita CD-ROM controller #3"
 #define DEVICE_REQUEST do_sbpcd3_request
 #define DEVICE_NR(device) (MINOR(device))
-#define DEVICE_ON(device)
-#define DEVICE_OFF(device)
 
 #elif (MAJOR_NR == MATSUSHITA_CDROM4_MAJOR)
 
 #define DEVICE_NAME "Matsushita CD-ROM controller #4"
 #define DEVICE_REQUEST do_sbpcd4_request
 #define DEVICE_NR(device) (MINOR(device))
-#define DEVICE_ON(device)
-#define DEVICE_OFF(device)
 
 #elif (MAJOR_NR == AZTECH_CDROM_MAJOR)
 
 #define DEVICE_NAME "Aztech CD-ROM"
 #define DEVICE_REQUEST do_aztcd_request
 #define DEVICE_NR(device) (MINOR(device))
-#define DEVICE_ON(device)
-#define DEVICE_OFF(device)
 
 #elif (MAJOR_NR == CDU535_CDROM_MAJOR)
 
@@ -280,55 +244,41 @@ static void floppy_off(unsigned int nr);
 #define DEVICE_INTR do_cdu535
 #define DEVICE_REQUEST do_cdu535_request
 #define DEVICE_NR(device) (MINOR(device))
-#define DEVICE_ON(device)
-#define DEVICE_OFF(device)
 
 #elif (MAJOR_NR == GOLDSTAR_CDROM_MAJOR)
 
 #define DEVICE_NAME "Goldstar R420"
 #define DEVICE_REQUEST do_gscd_request
 #define DEVICE_NR(device) (MINOR(device))
-#define DEVICE_ON(device)
-#define DEVICE_OFF(device)
 
 #elif (MAJOR_NR == CM206_CDROM_MAJOR)
 #define DEVICE_NAME "Philips/LMS CD-ROM cm206"
 #define DEVICE_REQUEST do_cm206_request
 #define DEVICE_NR(device) (MINOR(device))
-#define DEVICE_ON(device)
-#define DEVICE_OFF(device)
 
 #elif (MAJOR_NR == OPTICS_CDROM_MAJOR)
 
 #define DEVICE_NAME "DOLPHIN 8000AT CD-ROM"
 #define DEVICE_REQUEST do_optcd_request
 #define DEVICE_NR(device) (MINOR(device))
-#define DEVICE_ON(device)
-#define DEVICE_OFF(device)
 
 #elif (MAJOR_NR == SANYO_CDROM_MAJOR)
 
 #define DEVICE_NAME "Sanyo H94A CD-ROM"
 #define DEVICE_REQUEST do_sjcd_request
 #define DEVICE_NR(device) (MINOR(device))
-#define DEVICE_ON(device)
-#define DEVICE_OFF(device)
 
 #elif (MAJOR_NR == APBLOCK_MAJOR)
 
 #define DEVICE_NAME "apblock"
 #define DEVICE_REQUEST ap_request
 #define DEVICE_NR(device) (MINOR(device))
-#define DEVICE_ON(device) 
-#define DEVICE_OFF(device)
 
 #elif (MAJOR_NR == DDV_MAJOR)
 
 #define DEVICE_NAME "ddv"
 #define DEVICE_REQUEST ddv_request
 #define DEVICE_NR(device) (MINOR(device)>>PARTN_BITS)
-#define DEVICE_ON(device) 
-#define DEVICE_OFF(device)
 
 #elif (MAJOR_NR == MFM_ACORN_MAJOR)
 
@@ -336,41 +286,30 @@ static void floppy_off(unsigned int nr);
 #define DEVICE_INTR do_mfm
 #define DEVICE_REQUEST do_mfm_request
 #define DEVICE_NR(device) (MINOR(device) >> 6)
-#define DEVICE_ON(device)
-#define DEVICE_OFF(device)
 
 #elif (MAJOR_NR == NBD_MAJOR)
 
 #define DEVICE_NAME "nbd"
 #define DEVICE_REQUEST do_nbd_request
 #define DEVICE_NR(device) (MINOR(device))
-#define DEVICE_ON(device) 
-#define DEVICE_OFF(device)
-
 
 #elif (MAJOR_NR == MDISK_MAJOR)
 
 #define DEVICE_NAME "mdisk"
 #define DEVICE_REQUEST mdisk_request
 #define DEVICE_NR(device) (MINOR(device))
-#define DEVICE_ON(device) 
-#define DEVICE_OFF(device)
 
 #elif (MAJOR_NR == DASD_MAJOR)
 
 #define DEVICE_NAME "dasd"
 #define DEVICE_REQUEST do_dasd_request
 #define DEVICE_NR(device) (MINOR(device) >> PARTN_BITS)
-#define DEVICE_ON(device) 
-#define DEVICE_OFF(device)
 
 #elif (MAJOR_NR == I2O_MAJOR)
 
 #define DEVICE_NAME "I2O block"
 #define DEVICE_REQUEST do_i2ob_request
 #define DEVICE_NR(device) (MINOR(device)>>4)
-#define DEVICE_ON(device) 
-#define DEVICE_OFF(device)
 
 #elif (MAJOR_NR == COMPAQ_SMART2_MAJOR)
 
@@ -378,11 +317,18 @@ static void floppy_off(unsigned int nr);
 #define TIMEOUT_VALUE (25*HZ)
 #define DEVICE_REQUEST do_ida_request0
 #define DEVICE_NR(device) (MINOR(device) >> 4)
-#define DEVICE_ON(device)
-#define DEVICE_OFF(device)
 
 #endif /* MAJOR_NR == whatever */
 
+/* provide DEVICE_xxx defaults, if not explicitly defined
+ * above in the MAJOR_NR==xxx if-elif tree */
+#ifndef DEVICE_ON
+#define DEVICE_ON(device) do {} while (0)
+#endif
+#ifndef DEVICE_OFF
+#define DEVICE_OFF(device) do {} while (0)
+#endif
+
 #if (MAJOR_NR != SCSI_TAPE_MAJOR)
 #if !defined(IDE_DRIVER)
 
@@ -434,7 +380,7 @@ static void (DEVICE_REQUEST)(request_queue_t *);
 
 #if ! SCSI_BLK_MAJOR(MAJOR_NR) && (MAJOR_NR != COMPAQ_SMART2_MAJOR)
 
-static void end_request(int uptodate) {
+static inline void end_request(int uptodate) {
 	struct request *req = CURRENT;
 
 	if (end_that_request_first(req, uptodate, DEVICE_NAME))
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 44853fbe7..851bf3c53 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -150,8 +150,7 @@ extern struct sec_size * blk_sec[MAX_BLKDEV];
 extern struct blk_dev_struct blk_dev[MAX_BLKDEV];
 extern void grok_partitions(struct gendisk *dev, int drive, unsigned minors, long size);
 extern void register_disk(struct gendisk *dev, kdev_t first, unsigned minors, struct block_device_operations *ops, long size);
-extern void generic_make_request(request_queue_t *q, int rw,
-						struct buffer_head * bh);
+extern void generic_make_request(int rw, struct buffer_head * bh);
 extern request_queue_t *blk_get_queue(kdev_t dev);
 extern void blkdev_release_request(struct request *);
 
diff --git a/include/linux/brlock.h b/include/linux/brlock.h
index e68940b0f..2fd39cac9 100644
--- a/include/linux/brlock.h
+++ b/include/linux/brlock.h
@@ -77,7 +77,7 @@ extern void __br_lock_usage_bug (void);
 
 #ifdef __BRLOCK_USE_ATOMICS
 
-extern inline void br_read_lock (enum brlock_indices idx)
+static inline void br_read_lock (enum brlock_indices idx)
 {
 	/*
 	 * This causes a link-time bug message if an
@@ -89,7 +89,7 @@ extern inline void br_read_lock (enum brlock_indices idx)
 	read_lock(&__brlock_array[smp_processor_id()][idx]);
 }
 
-extern inline void br_read_unlock (enum brlock_indices idx)
+static inline void br_read_unlock (enum brlock_indices idx)
 {
 	if (idx >= __BR_END)
 		__br_lock_usage_bug();
@@ -98,7 +98,7 @@ extern inline void br_read_unlock (enum brlock_indices idx)
 }
 
 #else /* ! __BRLOCK_USE_ATOMICS */
-extern inline void br_read_lock (enum brlock_indices idx)
+static inline void br_read_lock (enum brlock_indices idx)
 {
 	unsigned int *ctr;
 	spinlock_t *lock;
@@ -124,7 +124,7 @@ again:
 	}
 }
 
-extern inline void br_read_unlock (enum brlock_indices idx)
+static inline void br_read_unlock (enum brlock_indices idx)
 {
 	unsigned int *ctr;
 
@@ -143,14 +143,14 @@ extern inline void br_read_unlock (enum brlock_indices idx)
 extern void FASTCALL(__br_write_lock (enum brlock_indices idx));
 extern void FASTCALL(__br_write_unlock (enum brlock_indices idx));
 
-extern inline void br_write_lock (enum brlock_indices idx)
+static inline void br_write_lock (enum brlock_indices idx)
 {
 	if (idx >= __BR_END)
 		__br_lock_usage_bug();
 	__br_write_lock(idx);
 }
 
-extern inline void br_write_unlock (enum brlock_indices idx)
+static inline void br_write_unlock (enum brlock_indices idx)
 {
 	if (idx >= __BR_END)
 		__br_lock_usage_bug();
diff --git a/include/linux/highmem.h b/include/linux/highmem.h
index bde781475..3cd0250ee 100644
--- a/include/linux/highmem.h
+++ b/include/linux/highmem.h
@@ -32,7 +32,7 @@ static __inline__ unsigned long kmap(struct page * page) {
 #endif /* CONFIG_HIGHMEM */
 
 /* when CONFIG_HIGHMEM is not set these will be plain clear/copy_page */
-extern inline void clear_user_highpage(struct page *page, unsigned long vaddr)
+static inline void clear_user_highpage(struct page *page, unsigned long vaddr)
 {
 	unsigned long kaddr;
 
@@ -41,7 +41,7 @@ extern inline void clear_user_highpage(struct page *page, unsigned long vaddr)
 	kunmap(page);
 }
 
-extern inline void clear_highpage(struct page *page)
+static inline void clear_highpage(struct page *page)
 {
 	unsigned long kaddr;
 
@@ -50,7 +50,7 @@ extern inline void clear_highpage(struct page *page)
 	kunmap(page);
 }
 
-extern inline void memclear_highpage(struct page *page, unsigned int offset, unsigned int size)
+static inline void memclear_highpage(struct page *page, unsigned int offset, unsigned int size)
 {
 	unsigned long kaddr;
 
@@ -64,7 +64,7 @@ extern inline void memclear_highpage(struct page *page, unsigned int offset, uns
 /*
  * Same but also flushes aliased cache contents to RAM.
  */
-extern inline void memclear_highpage_flush(struct page *page, unsigned int offset, unsigned int size)
+static inline void memclear_highpage_flush(struct page *page, unsigned int offset, unsigned int size)
 {
 	unsigned long kaddr;
 
@@ -76,7 +76,7 @@ extern inline void memclear_highpage_flush(struct page *page, unsigned int offse
 	kunmap(page);
 }
 
-extern inline void copy_user_highpage(struct page *to, struct page *from, unsigned long vaddr)
+static inline void copy_user_highpage(struct page *to, struct page *from, unsigned long vaddr)
 {
 	unsigned long vfrom, vto;
 
@@ -87,7 +87,7 @@ extern inline void copy_user_highpage(struct page *to, struct page *from, unsign
 	kunmap(to);
 }
 
-extern inline void copy_highpage(struct page *to, struct page *from)
+static inline void copy_highpage(struct page *to, struct page *from)
 {
 	unsigned long vfrom, vto;
 
diff --git a/include/linux/jffs.h b/include/linux/jffs.h
index 07621e2d5..61e7b66fe 100644
--- a/include/linux/jffs.h
+++ b/include/linux/jffs.h
@@ -1,14 +1,16 @@
 /*
  * JFFS -- Journalling Flash File System, Linux implementation.
  *
- * Copyright (C) 1999, 2000  Finn Hakansson, Axis Communications, Inc.
+ * Copyright (C) 1999, 2000  Axis Communications AB.
+ *
+ * Created by Finn Hakansson <finn@axis.com>.
  *
  * This is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * $Id: jffs.h,v 1.5 2000/06/13 14:22:48 alex Exp $
+ * $Id: jffs.h,v 1.11 2000/08/04 12:46:34 dwmw2 Exp $
  *
  * Ported to Linux 2.3.x and MTD:
  * Copyright (C) 2000  Alexander Larsson (alex@cendio.se), Cendio Systems AB
@@ -59,9 +61,6 @@
 #define JFFS_MODIFY_DATA  0x04
 #define JFFS_MODIFY_EXIST 0x08
 
-/* Using the garbage collection mechanism.  */
-#define USE_GC
-
 struct jffs_control;
 
 /* The JFFS raw inode structure: Used for storage on physical media.  */
@@ -87,7 +86,7 @@ struct jffs_raw_inode
 	__u8 nsize;       /* Name length.  */
 	__u8 nlink;       /* Number of links.  */
 	__u8 spare : 6;   /* For future use.  */
-	__u8 rename : 1;  /* Is this a special rename?  */
+	__u8 rename : 1;  /* Rename to a name of an already existing file?  */
 	__u8 deleted : 1; /* Has this file been deleted?  */
 	__u8 accurate;    /* The inode is obsolete if accurate == 0.  */
 	__u32 dchksum;    /* Checksum for the data.  */
@@ -161,17 +160,34 @@ struct jffs_file
 };
 
 
+/* This is just a definition of a simple list used for keeping track of
+   files deleted due to a rename.  This list is only used during the
+   mounting of the file system and only if there have been rename operations
+   earlier.  */
+struct jffs_delete_list
+{
+	__u32 ino;
+	struct jffs_delete_list *next;
+};
+
+
 /* A struct for the overall file system control.  Pointers to
    jffs_control structs are named `c' in the source code.  */
 struct jffs_control
 {
-	struct super_block *sb;  /* Reference to the VFS super block.  */
-	struct jffs_file *root;  /* The root directory file.  */
-	struct list_head *hash; /* Hash table for finding files by ino.  */
-	struct jffs_fmcontrol *fmc; /* Flash memory control structure.  */
-	__u32 hash_len;    /* The size of the hash table.  */
-	__u32 next_ino;    /* Next inode number to use for new files.  */
-	__u16 building_fs; /* Is the file system being built right now?  */
+	struct super_block *sb;		/* Reference to the VFS super block.  */
+	struct jffs_file *root;		/* The root directory file.  */
+	struct list_head *hash;		/* Hash table for finding files by ino.  */
+	struct jffs_fmcontrol *fmc;	/* Flash memory control structure.  */
+	__u32 hash_len;			/* The size of the hash table.  */
+	__u32 next_ino;			/* Next inode number to use for new files.  */
+	__u16 building_fs;		/* Is the file system being built right now?  */
+	struct jffs_delete_list *delete_list; /* Track deleted files.  */
+	pid_t thread_pid;		/* GC thread's PID */
+	struct task_struct *gc_task;	/* GC task struct */
+	struct semaphore gc_thread_sem; /* GC thread exit mutex */
+	__u32 gc_minfree_threshold;	/* GC trigger thresholds */
+	__u32 gc_maxdirty_threshold;
 };
 
 
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 94e30f7c7..a248e939f 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -338,9 +338,6 @@ extern unsigned long FASTCALL(get_zeroed_page(int gfp_mask));
 #define __get_dma_pages(gfp_mask, order) \
 		__get_free_pages((gfp_mask) | GFP_DMA,(order))
 
-#define virt_to_page(kaddr)	(mem_map + MAP_NR(kaddr))
-#define VALID_PAGE(page)	((page - mem_map) < max_mapnr)
-
 /*
  * The old interface name will be removed in 2.5:
  */
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 9f445ec6a..f12c936d8 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -677,9 +677,9 @@
 #define PCI_DEVICE_ID_TTI_HPT366	0x0004
 
 #define PCI_VENDOR_ID_VIA		0x1106
+#define PCI_DEVICE_ID_VIA_8363_0	0x0305
 #define PCI_DEVICE_ID_VIA_8371_0	0x0391
 #define PCI_DEVICE_ID_VIA_8501_0	0x0501
-#define PCI_DEVICE_ID_VIA_8601_0	0x0601
 #define PCI_DEVICE_ID_VIA_82C505	0x0505
 #define PCI_DEVICE_ID_VIA_82C561	0x0561
 #define PCI_DEVICE_ID_VIA_82C586_1	0x0571
@@ -690,25 +690,41 @@
 #define PCI_DEVICE_ID_VIA_82C596	0x0596
 #define PCI_DEVICE_ID_VIA_82C597_0	0x0597
 #define PCI_DEVICE_ID_VIA_82C598_0	0x0598
+#define PCI_DEVICE_ID_VIA_8601_0	0x0601
+#define PCI_DEVICE_ID_VIA_8605_0	0x0605
 #define PCI_DEVICE_ID_VIA_82C680	0x0680
 #define PCI_DEVICE_ID_VIA_82C686	0x0686
 #define PCI_DEVICE_ID_VIA_82C691	0x0691
 #define PCI_DEVICE_ID_VIA_82C693	0x0693
+#define PCI_DEVICE_ID_VIA_82C693_1	0x0698
 #define PCI_DEVICE_ID_VIA_82C926	0x0926
 #define PCI_DEVICE_ID_VIA_82C416	0x1571
 #define PCI_DEVICE_ID_VIA_82C595_97	0x1595
 #define PCI_DEVICE_ID_VIA_82C586_2	0x3038
 #define PCI_DEVICE_ID_VIA_82C586_3	0x3040
+#define PCI_DEVICE_ID_VIA_6305		0x3044
+#define PCI_DEVICE_ID_VIA_82C596_3	0x3050
+#define PCI_DEVICE_ID_VIA_82C596B_3	0x3051
 #define PCI_DEVICE_ID_VIA_82C686_4	0x3057
 #define PCI_DEVICE_ID_VIA_82C686_5	0x3058
+#define PCI_DEVICE_ID_VIA_8233_5	0x3059
+#define PCI_DEVICE_ID_VIA_8233_7	0x3065
 #define PCI_DEVICE_ID_VIA_82C686_6	0x3068
+#define PCI_DEVICE_ID_VIA_8233_0	0x3074
+#define PCI_DEVICE_ID_VIA_8633_0	0x3091
+#define PCI_DEVICE_ID_VIA_8367_0	0x3099
 #define PCI_DEVICE_ID_VIA_86C100A	0x6100
 #define PCI_DEVICE_ID_VIA_8231		0x8231
+#define PCI_DEVICE_ID_VIA_8231_4	0x8235
+#define PCI_DEVICE_ID_VIA_8365_1	0x8305
 #define PCI_DEVICE_ID_VIA_8371_1	0x8391
 #define PCI_DEVICE_ID_VIA_8501_1	0x8501
 #define PCI_DEVICE_ID_VIA_82C597_1	0x8597
 #define PCI_DEVICE_ID_VIA_82C598_1	0x8598
 #define PCI_DEVICE_ID_VIA_8601_1	0x8601
+#define PCI_DEVICE_ID_VIA_8505_1	0X8605
+#define PCI_DEVICE_ID_VIA_8633_1	0xB091
+#define PCI_DEVICE_ID_VIA_8367_1	0xB099
 
 #define PCI_VENDOR_ID_SMC2             0x1113
 #define PCI_DEVICE_ID_SMC2_1211TX      0x1211