Merge

7 files changed, 25 insertions, 42 deletions

diff --git a/include/linux/blk.h b/include/linux/blk.h
index a09126ffdacc..8523e8f841e3 100644
--- a/include/linux/blk.h
+++ b/include/linux/blk.h
@@ -12,24 +12,6 @@ extern void set_disk_ro(struct gendisk *disk, int flag);
 extern void add_disk_randomness(struct gendisk *disk);
 extern void rand_initialize_disk(struct gendisk *disk);
 
-#ifdef CONFIG_BLK_DEV_RAM
-
-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 */
-
-#ifdef CONFIG_BLK_DEV_INITRD
-
-#define INITRD_MINOR 250 /* shouldn't collide with /dev/ram* too soon ... */
-
-extern unsigned long initrd_start,initrd_end;
-extern int initrd_below_start_ok; /* 1 if it is not an error if initrd_start < memory_start */
-void initrd_init(void);
-
-#endif /* CONFIG_BLK_DEV_INITRD */
-
-#endif
-
 /*
  * end_request() and friends. Must be called with the request queue spinlock
  * acquired. All functions called within end_request() _must_be_ atomic.
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index ee3f66a5e60c..36741d178f34 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -341,7 +341,7 @@ extern int scsi_cmd_ioctl(struct block_device *, unsigned int, unsigned long);
 extern void blk_start_queue(request_queue_t *q);
 extern void blk_stop_queue(request_queue_t *q);
 extern void __blk_stop_queue(request_queue_t *q);
-extern void __blk_run_queue(request_queue_t *q);
+extern void blk_run_queue(request_queue_t *q);
 
 static inline request_queue_t *bdev_get_queue(struct block_device *bdev)
 {
diff --git a/include/linux/devfs_fs_kernel.h b/include/linux/devfs_fs_kernel.h
index 84c0abc4b840..a45a4060236d 100644
--- a/include/linux/devfs_fs_kernel.h
+++ b/include/linux/devfs_fs_kernel.h
@@ -25,7 +25,8 @@ extern devfs_handle_t devfs_register (devfs_handle_t dir, const char *name,
 				      unsigned int flags,
 				      unsigned int major, unsigned int minor,
 				      umode_t mode, void *ops, void *info);
-extern void devfs_unregister (devfs_handle_t de);
+extern int devfs_mk_bdev(dev_t dev, umode_t mode, const char *fmt, ...)
+	__attribute__((format (printf, 3, 4)));
 extern int devfs_mk_symlink (const char *name, const char *link);
 extern devfs_handle_t devfs_mk_dir(const char *fmt, ...)
 	__attribute__((format (printf, 1, 2)));
@@ -33,10 +34,6 @@ extern void devfs_remove(const char *fmt, ...)
 	__attribute__((format (printf, 1, 2)));
 extern int devfs_register_tape(const char *name);
 extern void devfs_unregister_tape(int num);
-extern void devfs_create_partitions(struct gendisk *dev);
-extern void devfs_create_cdrom(struct gendisk *dev);
-extern void devfs_remove_partitions(struct gendisk *dev);
-extern void devfs_remove_cdrom(struct gendisk *dev);
 extern void devfs_register_partition(struct gendisk *dev, int part);
 extern void mount_devfs_fs(void);
 #else  /*  CONFIG_DEVFS_FS  */
@@ -50,9 +47,9 @@ static inline devfs_handle_t devfs_register (devfs_handle_t dir,
 {
     return NULL;
 }
-static inline void devfs_unregister (devfs_handle_t de)
+static inline int devfs_mk_bdev(dev_t dev, umode_t mode, const char *fmt, ...)
 {
-    return;
+	return 0;
 }
 static inline int devfs_mk_symlink (const char *name, const char *link)
 {
@@ -72,18 +69,6 @@ static inline int devfs_register_tape (devfs_handle_t de)
 static inline void devfs_unregister_tape(int num)
 {
 }
-static inline void devfs_create_partitions(struct gendisk *dev)
-{
-}
-static inline void devfs_create_cdrom(struct gendisk *dev)
-{
-}
-static inline void devfs_remove_partitions(struct gendisk *dev)
-{
-}
-static inline void devfs_remove_cdrom(struct gendisk *dev)
-{
-}
 static inline void devfs_register_partition(struct gendisk *dev, int part)
 {
 }
diff --git a/include/linux/initrd.h b/include/linux/initrd.h
new file mode 100644
index 000000000000..d1978c358b12
--- /dev/null
+++ b/include/linux/initrd.h
@@ -0,0 +1,16 @@
+
+#define INITRD_MINOR 250 /* shouldn't collide with /dev/ram* too soon ... */
+
+/* 1 = load ramdisk, 0 = don't load */
+extern int rd_doload;
+
+/* 1 = prompt for ramdisk, 0 = don't prompt */
+extern int rd_prompt;
+
+/* starting block # of image */
+extern int rd_image_start;
+
+/* 1 if it is not an error if initrd_start < memory_start */
+extern int initrd_below_start_ok;
+
+extern unsigned long initrd_start, initrd_end;
diff --git a/include/linux/input.h b/include/linux/input.h
index 5991c97b45cc..ca2f6f6b2d1e 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -895,8 +895,8 @@ void input_close_device(struct input_handle *);
 int input_accept_process(struct input_handle *handle, struct file *file);
 int input_flush_device(struct input_handle* handle, struct file* file);
 
-devfs_handle_t input_register_minor(char *name, int minor, int minor_base);
-void input_unregister_minor(devfs_handle_t handle);
+/* will go away once devfs_register gets sanitized */
+void input_register_minor(char *name, int minor, int minor_base);
 
 void input_event(struct input_dev *dev, unsigned int type, unsigned int code, int value);
 
diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h
index b7b3da409f8a..c8b70414ebf6 100644
--- a/include/linux/miscdevice.h
+++ b/include/linux/miscdevice.h
@@ -44,7 +44,7 @@ struct miscdevice
 	const char *name;
 	struct file_operations *fops;
 	struct miscdevice * next, * prev;
-	devfs_handle_t devfs_handle;
+	char devfs_name[64];
 };
 
 extern int misc_register(struct miscdevice * misc);
diff --git a/include/linux/videodev.h b/include/linux/videodev.h
index fc6d314ecfc1..6c684a84142b 100644
--- a/include/linux/videodev.h
+++ b/include/linux/videodev.h
@@ -39,7 +39,7 @@ struct video_device
 	/* for videodev.c intenal usage -- don't touch */
 	int users;
 	struct semaphore lock;
-	devfs_handle_t devfs_handle;
+	char devfs_name[64];	/* devfs */
 };
 
 #define VIDEO_MAJOR	81