diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /drivers/acorn/block | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'drivers/acorn/block')
| -rw-r--r-- | drivers/acorn/block/fd1772.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/acorn/block/fd1772.c b/drivers/acorn/block/fd1772.c index 8ee368ac9..59030ebd5 100644 --- a/drivers/acorn/block/fd1772.c +++ b/drivers/acorn/block/fd1772.c @@ -116,6 +116,8 @@ * 16/11/96 - Fiddled and frigged for 2.0.18 * * DAG 30/01/99 - Started frobbing for 2.2.1 + * DAG 20/06/99 - A little more frobbing: + * Included include/asm/uaccess.h for get_user/put_user */ #include <linux/sched.h> @@ -142,6 +144,8 @@ #include <asm/irq.h> #include <asm/pgtable.h> #include <asm/segment.h> +#include <asm/uaccess.h> + #define MAJOR_NR FLOPPY_MAJOR #define FLOPPY_DMA 0 @@ -1600,7 +1604,7 @@ static struct file_operations floppy_fops = }; -int floppy_init(void) +int fd1772_init(void) { int i; |