summaryrefslogtreecommitdiffstats
path: root/drivers/acorn/block/fd1772.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-07-21 22:00:56 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-07-21 22:00:56 +0000
commit168660f24dfc46c2702acbe4701a446f42a59578 (patch)
treef431368afbf6b1b71809cf3fd904d800ea126f4d /drivers/acorn/block/fd1772.c
parent6420f767924fa73b0ea267864d96820815f4ba5a (diff)
Merge with Linux 2.4.0-test5-pre3.
Diffstat (limited to 'drivers/acorn/block/fd1772.c')
-rw-r--r--drivers/acorn/block/fd1772.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/acorn/block/fd1772.c b/drivers/acorn/block/fd1772.c
index 980add976..5e90e6ba4 100644
--- a/drivers/acorn/block/fd1772.c
+++ b/drivers/acorn/block/fd1772.c
@@ -1566,6 +1566,7 @@ static void floppy_release(struct inode *inode, struct file *filp)
static struct block_device_operations floppy_fops =
{
+ owner: THIS_MODULE,
open: floppy_open,
release: floppy_release,
ioctl: fd_ioctl,
@@ -1578,6 +1579,9 @@ int fd1772_init(void)
{
int i;
+ if (!machine_is_arc())
+ return 0;
+
if (register_blkdev(MAJOR_NR, "fd", &floppy_fops)) {
printk("Unable to get major %d for floppy\n", MAJOR_NR);
return 1;