diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-21 22:00:56 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-21 22:00:56 +0000 |
| commit | 168660f24dfc46c2702acbe4701a446f42a59578 (patch) | |
| tree | f431368afbf6b1b71809cf3fd904d800ea126f4d /drivers/acorn | |
| parent | 6420f767924fa73b0ea267864d96820815f4ba5a (diff) | |
Merge with Linux 2.4.0-test5-pre3.
Diffstat (limited to 'drivers/acorn')
| -rw-r--r-- | drivers/acorn/block/fd1772.c | 4 | ||||
| -rw-r--r-- | drivers/acorn/char/Makefile | 1 |
2 files changed, 4 insertions, 1 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; diff --git a/drivers/acorn/char/Makefile b/drivers/acorn/char/Makefile index d4658724a..d102cc876 100644 --- a/drivers/acorn/char/Makefile +++ b/drivers/acorn/char/Makefile @@ -27,7 +27,6 @@ obj- := export-objs := mouse_rpc.o obj-arc := keyb_arc.o -obj-a5k := keyb_arc.o obj-rpc := keyb_ps2.o obj-$(CONFIG_RPCMOUSE) += mouse_rpc.o |