5 files changed, 16 insertions, 11 deletions
diff --git a/include/linux/bio.h b/include/linux/bio.h
index 550679134fd8..85e518c1c1e6 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -100,7 +100,6 @@ struct bio {
 #define bio_iovec_idx(bio, idx)	(&((bio)->bi_io_vec[(idx)]))
 #define bio_iovec(bio)		bio_iovec_idx((bio), (bio)->bi_idx)
 #define bio_page(bio)		bio_iovec((bio))->bv_page
-#define __bio_offset(bio, idx)	bio_iovec_idx((bio), (idx))->bv_offset
 #define bio_offset(bio)		bio_iovec((bio))->bv_offset
 #define bio_sectors(bio)	((bio)->bi_size >> 9)
 #define bio_data(bio)		(page_address(bio_page((bio))) + bio_offset((bio)))
@@ -136,11 +135,18 @@ struct bio {
 
 #define bio_io_error(bio) bio_endio((bio), 0, bio_sectors((bio)))
 
-#define bio_for_each_segment(bvl, bio, i)				\
-	for (bvl = bio_iovec((bio)), i = (bio)->bi_idx;			\
+/*
+ * drivers should not use the __ version unless they _really_ want to
+ * run through the entire bio and not just pending pieces
+ */
+#define __bio_for_each_segment(bvl, bio, i, start_idx)			\
+	for (bvl = bio_iovec_idx((bio), (start_idx)), i = (start_idx);	\
 	     i < (bio)->bi_vcnt;					\
 	     bvl++, i++)
 
+#define bio_for_each_segment(bvl, bio, i)				\
+	__bio_for_each_segment(bvl, bio, i, (bio)->bi_idx)
+
 /*
  * get a reference to a bio, so it won't disappear. the intended use is
  * something like:
diff --git a/include/linux/blk.h b/include/linux/blk.h
index 29db6a337ef5..e54f03ebbf02 100644
--- a/include/linux/blk.h
+++ b/include/linux/blk.h
@@ -22,6 +22,9 @@ extern void add_blkdev_randomness(int major);
 extern unsigned long initrd_start,initrd_end;
 extern int mount_initrd; /* zero if initrd should not be mounted */
 extern int initrd_below_start_ok; /* 1 if it is not an error if initrd_start < memory_start */
+extern int rd_doload;		/* 1 = load ramdisk, 0 = don't load */
+extern int rd_prompt;		/* 1 = prompt for ramdisk, 0 = don't prompt */
+extern int rd_image_start;	/* starting block # of image */
 void initrd_init(void);
 
 #endif
diff --git a/include/linux/device.h b/include/linux/device.h
index df9e1724d3e7..32a2fed4dddd 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -113,10 +113,6 @@ struct iobus_driver {
 	int	(*add_device)	(struct iobus*, char*);
 };
 
-extern int iobus_register_driver(struct iobus_driver * driver);
-extern void iobus_unregister_driver(struct iobus_driver * driver);
-extern struct iobus_driver * iobus_find_driver(char *name);
-
 struct iobus {
 	spinlock_t	lock;		/* lock for bus */
 	atomic_t	refcount;
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 2bc05a6b28b5..7f52b46d619f 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1447,11 +1447,9 @@ extern char root_device_name[];
 
 
 extern void show_buffers(void);
-extern void mount_root(void);
 
 #ifdef CONFIG_BLK_DEV_INITRD
 extern unsigned int real_root_dev;
-extern int change_root(kdev_t, const char *);
 #endif
 
 extern ssize_t char_read(struct file *, char *, size_t, loff_t *);
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index a8753bec73cb..d73d486aba93 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -912,7 +912,7 @@
 #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_8363_0	0x0305 
 #define PCI_DEVICE_ID_VIA_8371_0	0x0391
 #define PCI_DEVICE_ID_VIA_8501_0	0x0501
 #define PCI_DEVICE_ID_VIA_82C505	0x0505
@@ -946,9 +946,11 @@
 #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_8622          0x3102 
 #define PCI_DEVICE_ID_VIA_8233C_0	0x3109
+#define PCI_DEVICE_ID_VIA_8361          0x3112 
 #define PCI_DEVICE_ID_VIA_8633_0	0x3091
-#define PCI_DEVICE_ID_VIA_8367_0	0x3099
+#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