diff options
author | Joe Perches <joe@perches.com> | 2010-03-10 18:20:44 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-12 18:52:28 -0500 |
commit | d49375434ec011dabcc8bfa5091f5327284e42ce (patch) | |
tree | a688c3e9b2cd35fdcfcc0246081e232df3e5c2bd /drivers/block | |
parent | 718a38211bf4375c0a1efad3afbc5dbaef5d33f9 (diff) |
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>
Diffstat (limited to 'drivers/block')
-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 b9b117059b62..65e2443b207a 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c | |||
@@ -180,6 +180,8 @@ static int print_unex = 1; | |||
180 | #include <linux/mod_devicetable.h> | 180 | #include <linux/mod_devicetable.h> |
181 | #include <linux/buffer_head.h> /* for invalidate_buffers() */ | 181 | #include <linux/buffer_head.h> /* for invalidate_buffers() */ |
182 | #include <linux/mutex.h> | 182 | #include <linux/mutex.h> |
183 | #include <linux/io.h> | ||
184 | #include <linux/uaccess.h> | ||
183 | 185 | ||
184 | /* | 186 | /* |
185 | * PS/2 floppies have much slower step rates than regular floppies. | 187 | * PS/2 floppies have much slower step rates than regular floppies. |
@@ -191,8 +193,6 @@ static int slow_floppy; | |||
191 | #include <asm/dma.h> | 193 | #include <asm/dma.h> |
192 | #include <asm/irq.h> | 194 | #include <asm/irq.h> |
193 | #include <asm/system.h> | 195 | #include <asm/system.h> |
194 | #include <asm/io.h> | ||
195 | #include <asm/uaccess.h> | ||
196 | 196 | ||
197 | static int FLOPPY_IRQ = 6; | 197 | static int FLOPPY_IRQ = 6; |
198 | static int FLOPPY_DMA = 2; | 198 | static int FLOPPY_DMA = 2; |