Merge http://gkernel.bkbits.net/net-drivers-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux

5 files changed, 7 insertions, 18 deletions

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 01497e05a70a..372af31e3706 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -310,14 +310,13 @@ extern void blk_queue_hardsect_size(request_queue_t *q, unsigned short);
 extern void blk_queue_segment_boundary(request_queue_t *q, unsigned long);
 extern void blk_queue_assign_lock(request_queue_t *q, spinlock_t *);
 extern void blk_queue_prep_rq(request_queue_t *q, prep_rq_fn *pfn);
-extern unsigned long *blk_get_ra_pages(kdev_t kdev);
+extern unsigned long *blk_get_ra_pages(struct block_device *bdev);
 
 extern int blk_rq_map_sg(request_queue_t *, struct request *, struct scatterlist *);
 extern void blk_dump_rq_flags(struct request *, char *);
 extern void generic_unplug_device(void *);
 
 extern int * blk_size[MAX_BLKDEV];	/* in units of 1024 bytes */
-extern int * blksize_size[MAX_BLKDEV];
 
 #define MAX_PHYS_SEGMENTS 128
 #define MAX_HW_SEGMENTS 128
@@ -335,7 +334,6 @@ extern inline void blk_clear(int major)
 #if 0
 	blk_size_in_bytes[major] = NULL;
 #endif
-	blksize_size[major] = NULL;
 }
 
 extern inline int queue_hardsect_size(request_queue_t *q)
@@ -372,17 +370,9 @@ extern inline unsigned int blksize_bits(unsigned int size)
 	return bits;
 }
 
-extern inline unsigned int block_size(kdev_t dev)
+extern inline unsigned int block_size(struct block_device *bdev)
 {
-	int retval = BLOCK_SIZE;
-	int major = major(dev);
-
-	if (blksize_size[major]) {
-		int minor = minor(dev);
-		if (blksize_size[major][minor])
-			retval = blksize_size[major][minor];
-	}
-	return retval;
+	return bdev->bd_block_size;
 }
 
 static inline loff_t blkdev_size_in_bytes(kdev_t dev)
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
index f9158122b3f7..80f6e106d723 100644
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
@@ -151,10 +151,6 @@ void create_empty_buffers(struct page *, unsigned long,
 void end_buffer_io_sync(struct buffer_head *bh, int uptodate);
 void buffer_insert_list(spinlock_t *lock,
 			struct buffer_head *, struct list_head *);
-struct buffer_head *get_hash_table(kdev_t dev, sector_t block, int size);
-struct buffer_head *getblk(kdev_t dev, sector_t block, int size);
-struct buffer_head *bread(kdev_t dev, int block, int size);
-
 
 /* reiserfs_writepage needs this */
 void set_buffer_async_io(struct buffer_head *bh);
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 3925906923e5..cf2020f10428 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -343,6 +343,7 @@ struct block_device {
 	void *			bd_holder;
 	int			bd_holders;
 	struct block_device *	bd_contains;
+	unsigned		bd_block_size;
 };
 
 struct inode {
@@ -1259,7 +1260,7 @@ extern int submit_bh(int, struct buffer_head *);
 struct bio;
 extern int submit_bio(int, struct bio *);
 extern int is_read_only(kdev_t);
-extern int set_blocksize(kdev_t, int);
+extern int set_blocksize(struct block_device *, int);
 extern int sb_set_blocksize(struct super_block *, int);
 extern int sb_min_blocksize(struct super_block *, int);
 
diff --git a/include/linux/irda.h b/include/linux/irda.h
index 37ba774ab3fa..65fa89989607 100644
--- a/include/linux/irda.h
+++ b/include/linux/irda.h
@@ -67,6 +67,7 @@ typedef enum {
 	IRDA_AIRPORT_DONGLE      = 6,
 	IRDA_OLD_BELKIN_DONGLE   = 7,
 	IRDA_EP7211_IR           = 8,
+	IRDA_MCP2120_DONGLE      = 9,
 } IRDA_DONGLE;
 
 /* Protocol types to be used for SOCK_DGRAM */
diff --git a/include/linux/swap.h b/include/linux/swap.h
index 91e1970277c5..c234a654e125 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -79,6 +79,7 @@ struct swap_info_struct {
 	unsigned int flags;
 	spinlock_t sdev_lock;
 	struct file *swap_file;
+	unsigned old_block_size;
 	unsigned short * swap_map;
 	unsigned int lowest_bit;
 	unsigned int highest_bit;