git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
block
/
amiflop.c
diff --git
a/drivers/block/amiflop.c
b/drivers/block/amiflop.c
index
b6e2909
..
5d65621
100644
(file)
--- a/
drivers/block/amiflop.c
+++ b/
drivers/block/amiflop.c
@@
-64,6
+64,7
@@
#include <linux/buffer_head.h>
#include <linux/blkdev.h>
#include <linux/elevator.h>
#include <linux/buffer_head.h>
#include <linux/blkdev.h>
#include <linux/elevator.h>
+#include <linux/interrupt.h>
#include <asm/setup.h>
#include <asm/uaccess.h>
#include <asm/setup.h>
#include <asm/uaccess.h>
@@
-208,7
+209,7
@@
static int fd_device[4] = { 0, 0, 0, 0 };
/* Milliseconds timer */
/* Milliseconds timer */
-static irqreturn_t ms_isr(int irq, void *dummy
, struct pt_regs *fp
)
+static irqreturn_t ms_isr(int irq, void *dummy)
{
ms_busy = -1;
wake_up(&ms_wait);
{
ms_busy = -1;
wake_up(&ms_wait);
@@
-559,7
+560,7
@@
static unsigned long fd_get_drive_id(int drive)
return (id);
}
return (id);
}
-static irqreturn_t fd_block_done(int irq, void *dummy
, struct pt_regs *fp
)
+static irqreturn_t fd_block_done(int irq, void *dummy)
{
if (block_flag)
custom.dsklen = 0x4000;
{
if (block_flag)
custom.dsklen = 0x4000;
@@
-1708,10
+1709,13
@@
static struct kobject *floppy_find(dev_t dev, int *part, void *data)
return get_disk(unit[drive].gendisk);
}
return get_disk(unit[drive].gendisk);
}
-int __init amiga_floppy_init(void)
+
static
int __init amiga_floppy_init(void)
{
int i, ret;
{
int i, ret;
+ if (!MACH_IS_AMIGA)
+ return -ENXIO;
+
if (!AMIGAHW_PRESENT(AMI_FLOPPY))
return -ENXIO;
if (!AMIGAHW_PRESENT(AMI_FLOPPY))
return -ENXIO;
@@
-1808,15
+1812,9
@@
out_blkdev:
return ret;
}
return ret;
}
+module_init(amiga_floppy_init);
#ifdef MODULE
#ifdef MODULE
-int init_module(void)
-{
- if (!MACH_IS_AMIGA)
- return -ENXIO;
- return amiga_floppy_init();
-}
-
#if 0 /* not safe to unload */
void cleanup_module(void)
{
#if 0 /* not safe to unload */
void cleanup_module(void)
{
@@
-1850,6
+1848,7
@@
static int __init amiga_floppy_setup (char *str)
return 0;
printk (KERN_INFO "amiflop: Setting default df0 to %x\n", n);
fd_def_df0 = n;
return 0;
printk (KERN_INFO "amiflop: Setting default df0 to %x\n", n);
fd_def_df0 = n;
+ return 1;
}
__setup("floppy=", amiga_floppy_setup);
}
__setup("floppy=", amiga_floppy_setup);