diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-14 07:02:09 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-14 07:02:09 -0500 |
| commit | 704867ede0c3645075ff3438d1a4fd4977abaa8d (patch) | |
| tree | fc89b31764132dc1b07e0af3e53219005cfb8f95 /drivers/ide/ide-floppy.c | |
| parent | 681ba97d9fbff59f67c71f1d9a88ad0b8ef49d25 (diff) | |
| parent | cfe04478fa1b472264b7fe9bbf547710aa344d3c (diff) | |
Merge branch 'mfd/da9052' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc into regmap-next
Diffstat (limited to 'drivers/ide/ide-floppy.c')
| -rw-r--r-- | drivers/ide/ide-floppy.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index 61fdf544fbd..3d42043fec5 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | #include <scsi/scsi_ioctl.h> | 35 | #include <scsi/scsi_ioctl.h> |
| 36 | 36 | ||
| 37 | #include <asm/byteorder.h> | 37 | #include <asm/byteorder.h> |
| 38 | #include <linux/irq.h> | ||
| 39 | #include <linux/uaccess.h> | 38 | #include <linux/uaccess.h> |
| 40 | #include <linux/io.h> | 39 | #include <linux/io.h> |
| 41 | #include <asm/unaligned.h> | 40 | #include <asm/unaligned.h> |