X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fchar%2Fnvram.c;h=39f6357e3b5d0a63e432cf0238cc84aba4b8d33f;hb=c5b0079c0a7641caac3fedab75e8e63aeb54d7e2;hp=197cd7a0c33267d9f1becd4b61b8724ac728e804;hpb=dc7c65db2845a8d17432d89252c4227a9a7cb15f;p=linux-2.6

diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
index 197cd7a0c3..39f6357e3b 100644
--- a/drivers/char/nvram.c
+++ b/drivers/char/nvram.c
@@ -107,7 +107,6 @@
 #include <linux/init.h>
 #include <linux/proc_fs.h>
 #include <linux/spinlock.h>
-#include <linux/smp_lock.h>
 
 #include <asm/io.h>
 #include <asm/uaccess.h>
@@ -444,7 +443,7 @@ nvram_init(void)
 
 	/* First test whether the driver should init at all */
 	if (!CHECK_DRIVER_INIT())
-		return -ENXIO;
+		return -ENODEV;
 
 	ret = misc_register(&nvram_dev);
 	if (ret) {