diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-11-24 03:34:03 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-11-24 03:34:03 -0500 |
| commit | 17f0056e6a2f3d1818801705f5e12b71217bf4ef (patch) | |
| tree | fe6fa1c0b92c43804a31b443ce4b5159d4d0ce13 /drivers/ide/ide-cd.c | |
| parent | f87114e982cf3b657411e2df50e4e42ec1f162dd (diff) | |
| parent | be09d1dcf21eb3121bed3ee4dadacdea1805d7f8 (diff) | |
Merge branch 'rmobile-fixes-for-linus' into rmobile-latest
Diffstat (limited to 'drivers/ide/ide-cd.c')
| -rw-r--r-- | drivers/ide/ide-cd.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index 04b09564bfa9..8126824daccb 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c | |||
| @@ -43,7 +43,6 @@ | |||
| 43 | /* For SCSI -> ATAPI command conversion */ | 43 | /* For SCSI -> ATAPI command conversion */ |
| 44 | #include <scsi/scsi.h> | 44 | #include <scsi/scsi.h> |
| 45 | 45 | ||
| 46 | #include <linux/irq.h> | ||
| 47 | #include <linux/io.h> | 46 | #include <linux/io.h> |
| 48 | #include <asm/byteorder.h> | 47 | #include <asm/byteorder.h> |
| 49 | #include <linux/uaccess.h> | 48 | #include <linux/uaccess.h> |