From d8804ce0e9d85ee61d0354108b4968499b66138b Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Thu, 17 Jul 2008 21:16:10 +0200
Subject: [PATCH] --- yaml --- r: 102386 b: refs/heads/master c:
 e945b568e28b42de893ef24989372f0219501d32 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/block/ataflop.c         | 4 ++--
 trunk/drivers/char/nvram.c            | 2 +-
 trunk/drivers/input/keyboard/atakbd.c | 2 +-
 trunk/drivers/video/atafb.c           | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index adeb238f08a5..1c71b6ffb039 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 038eddd9acf34e8202b31af3ee9eb48179114323
+refs/heads/master: e945b568e28b42de893ef24989372f0219501d32
diff --git a/trunk/drivers/block/ataflop.c b/trunk/drivers/block/ataflop.c
index 424995073c6b..49f274197b16 100644
--- a/trunk/drivers/block/ataflop.c
+++ b/trunk/drivers/block/ataflop.c
@@ -1880,11 +1880,11 @@ static int __init atari_floppy_init (void)
 
 	if (!MACH_IS_ATARI)
 		/* Amiga, Mac, ... don't have Atari-compatible floppy :-) */
-		return -ENXIO;
+		return -ENODEV;
 
 	if (MACH_IS_HADES)
 		/* Hades doesn't have Atari-compatible floppy */
-		return -ENXIO;
+		return -ENODEV;
 
 	if (register_blkdev(FLOPPY_MAJOR,"fd"))
 		return -EBUSY;
diff --git a/trunk/drivers/char/nvram.c b/trunk/drivers/char/nvram.c
index 197cd7a0c332..a22662b6a1a5 100644
--- a/trunk/drivers/char/nvram.c
+++ b/trunk/drivers/char/nvram.c
@@ -444,7 +444,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) {
diff --git a/trunk/drivers/input/keyboard/atakbd.c b/trunk/drivers/input/keyboard/atakbd.c
index 4e92100c56a8..1839194ea987 100644
--- a/trunk/drivers/input/keyboard/atakbd.c
+++ b/trunk/drivers/input/keyboard/atakbd.c
@@ -220,7 +220,7 @@ static int __init atakbd_init(void)
 	int i, error;
 
 	if (!MACH_IS_ATARI || !ATARIHW_PRESENT(ST_MFP))
-		return -EIO;
+		return -ENODEV;
 
 	// need to init core driver if not already done so
 	if (atari_keyb_init())
diff --git a/trunk/drivers/video/atafb.c b/trunk/drivers/video/atafb.c
index dff35474b854..c8605730a1b0 100644
--- a/trunk/drivers/video/atafb.c
+++ b/trunk/drivers/video/atafb.c
@@ -3110,7 +3110,7 @@ int __init atafb_init(void)
 	printk("atafb_init: start\n");
 
 	if (!MACH_IS_ATARI)
-		return -ENXIO;
+		return -ENODEV;
 
 	do {
 #ifdef ATAFB_EXT