diff options
| author | Joe Perches <joe@perches.com> | 2010-03-10 15:20:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-12 15:52:28 -0800 |
| commit | d49375434ec011dabcc8bfa5091f5327284e42ce (patch) | |
| tree | a688c3e9b2cd35fdcfcc0246081e232df3e5c2bd | |
| parent | 718a38211bf4375c0a1efad3afbc5dbaef5d33f9 (diff) | |
| download | linux-3.10-d49375434ec011dabcc8bfa5091f5327284e42ce.tar.gz linux-3.10-d49375434ec011dabcc8bfa5091f5327284e42ce.tar.bz2 linux-3.10-d49375434ec011dabcc8bfa5091f5327284e42ce.zip | |
drivers/block/floppy.c: convert some #include <asm/ to #include <linux/
Signed-off-by: Joe Perches <joe@perches.com>
Cc: Stephen Hemminger <shemminger@vyatta.com>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Marcin Slusarz <marcin.slusarz@gmail.com>
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | drivers/block/floppy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index b9b117059b6..65e2443b207 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -180,6 +180,8 @@ static int print_unex = 1; #include <linux/mod_devicetable.h> #include <linux/buffer_head.h> /* for invalidate_buffers() */ #include <linux/mutex.h> +#include <linux/io.h> +#include <linux/uaccess.h> /* * PS/2 floppies have much slower step rates than regular floppies. @@ -191,8 +193,6 @@ static int slow_floppy; #include <asm/dma.h> #include <asm/irq.h> #include <asm/system.h> -#include <asm/io.h> -#include <asm/uaccess.h> static int FLOPPY_IRQ = 6; static int FLOPPY_DMA = 2; |