5 files changed, 8 insertions, 8 deletions

diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c
index c9751b2b57e6..7516baff3bb9 100644
--- a/drivers/block/amiflop.c
+++ b/drivers/block/amiflop.c
@@ -1714,10 +1714,10 @@ static int __init amiga_floppy_init(void)
         int i, ret;
 
         if (!MACH_IS_AMIGA)
-                return -ENXIO;
+                return -ENODEV;
 
         if (!AMIGAHW_PRESENT(AMI_FLOPPY))
-                return -ENXIO;
+                return -ENODEV;
 
         if (register_blkdev(FLOPPY_MAJOR,"fd"))
                 return -EBUSY;
@@ -1755,7 +1755,7 @@ static int __init amiga_floppy_init(void)
         if (!floppy_queue)
                 goto out_queue;
 
-        ret = -ENXIO;
+        ret = -ENODEV;
         if (fd_probe_drives() < 1) /* No usable drives */
                 goto out_probe;
 
diff --git a/drivers/block/z2ram.c b/drivers/block/z2ram.c
index 2d5853cbd4b0..be20a67f1fa8 100644
--- a/drivers/block/z2ram.c
+++ b/drivers/block/z2ram.c
@@ -332,7 +332,7 @@ z2_init(void)
     int ret;
 
     if (!MACH_IS_AMIGA)
-        return -ENXIO;
+        return -ENODEV;
 
     ret = -EBUSY;
     if (register_blkdev(Z2RAM_MAJOR, DEVICE_NAME))
diff --git a/drivers/input/serio/q40kbd.c b/drivers/input/serio/q40kbd.c
index cb89aff2e160..d962a8d78b14 100644
--- a/drivers/input/serio/q40kbd.c
+++ b/drivers/input/serio/q40kbd.c
@@ -156,7 +156,7 @@ static int __init q40kbd_init(void)
         int error;
 
         if (!MACH_IS_Q40)
-                return -EIO;
+                return -ENODEV;
 
         error = platform_driver_register(&q40kbd_driver);
         if (error)
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c
index e6492c1048bf..05a328c11a8b 100644
--- a/drivers/video/amifb.c
+++ b/drivers/video/amifb.c
@@ -2261,7 +2261,7 @@ int __init amifb_init(void)
         amifb_setup(option);
 #endif
         if (!MACH_IS_AMIGA || !AMIGAHW_PRESENT(AMI_VIDEO))
-                return -ENXIO;
+                return -ENODEV;
 
         /*
          * We request all registers starting from bplpt[0]
@@ -2333,7 +2333,7 @@ default_chipset:
                         strcat(fb_info.fix.id, "Unknown");
                         goto default_chipset;
 #else /* CONFIG_FB_AMIGA_OCS */
-                        err = -ENXIO;
+                        err = -ENODEV;
                         goto amifb_error;
 #endif /* CONFIG_FB_AMIGA_OCS */
                         break;
diff --git a/drivers/video/hpfb.c b/drivers/video/hpfb.c
index 2eb4fb159084..b8ebff1e8493 100644
--- a/drivers/video/hpfb.c
+++ b/drivers/video/hpfb.c
@@ -382,7 +382,7 @@ int __init hpfb_init(void)
 #define INTFBPADDR 0x560000
 
         if (!MACH_IS_HP300)
-                return -ENXIO;
+                return -ENODEV;
 
         if (fb_get_options("hpfb", NULL))
                 return -ENODEV;