diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-12-06 00:42:35 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-12-06 00:43:49 -0500 |
| commit | d6c1c49de577fa292af2449817364b7d89b574d8 (patch) | |
| tree | e97cf88a318f50eb23c18d790e8b0bcf7bb47169 /drivers/ide/ide-floppy.c | |
| parent | 9dde9dc0a81c7aeb863b35121d09011f09b4897c (diff) | |
| parent | ddf6e0e50723b62ac76ed18eb53e9417c6eefba7 (diff) | |
Merge branch 'perf/urgent' into perf/core
Merge reason: Add these cherry-picked commits so that future changes
on perf/core don't conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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> |