X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fsh%2Fkernel%2Fcpu%2Fsh4%2Fsq.c;h=8437ea7430fe061cec70510f9f0f0bb66d2e5fb1;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=b09805f3ee23799e8a78379856211d2b967a30f0;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/arch/sh/kernel/cpu/sh4/sq.c b/arch/sh/kernel/cpu/sh4/sq.c
index b09805f3e..8437ea743 100644
--- a/arch/sh/kernel/cpu/sh4/sq.c
+++ b/arch/sh/kernel/cpu/sh4/sq.c
@@ -19,6 +19,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/config.h>
 #include <linux/slab.h>
 #include <linux/list.h>
 #include <linux/proc_fs.h>
@@ -416,27 +417,24 @@ static struct file_operations sq_fops = {
 static struct miscdevice sq_dev = {
 	.minor		= STORE_QUEUE_MINOR,
 	.name		= "sq",
+	.devfs_name	= "cpu/sq",
 	.fops		= &sq_fops,
 };
 
 static int __init sq_api_init(void)
 {
-	int ret;
 	printk(KERN_NOTICE "sq: Registering store queue API.\n");
 
+#ifdef CONFIG_PROC_FS
 	create_proc_read_entry("sq_mapping", 0, 0, sq_mapping_read_proc, 0);
+#endif
 
-	ret = misc_register(&sq_dev);
-	if (ret)
-		remove_proc_entry("sq_mapping", NULL);
-
-	return ret;
+	return misc_register(&sq_dev);
 }
 
 static void __exit sq_api_exit(void)
 {
 	misc_deregister(&sq_dev);
-	remove_proc_entry("sq_mapping", NULL);
 }
 
 module_init(sq_api_init);