diff options
| author |   Geert Uytterhoeven <geert@linux-m68k.org> | 2011-05-25 21:40:59 +0200 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2011-11-08 22:35:46 +0100 |
| commit | 3ec7215e5d1a714ef65069a1d0999a31e4930bb7 (patch) | |
| tree | c68f48ad75828a95b57125704e2d206b6cebf90c /drivers/ide/ide-cd.c | |
| parent | m68k: Revive lost DIO bus config option (diff) | |
| download | linux-dev-3ec7215e5d1a714ef65069a1d0999a31e4930bb7.tar.xz linux-dev-3ec7215e5d1a714ef65069a1d0999a31e4930bb7.zip | |
ide-{cd,floppy,tape}: Do not include <linux/irq.h>
The top of <linux/irq.h> has this comment:
* Please do not include this file in generic code. There is currently
* no requirement for any architecture to implement anything held
* within this file.
*
* Thanks. --rmk
Remove inclusion of <linux/irq.h>, to prevent the following compile error
from happening soon:
| include/linux/irq.h:132: error: redefinition of ‘struct irq_data’
| include/linux/irq.h:286: error: redefinition of ‘struct irq_chip’
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Borislav Petkov <bp@alien8.de>
Cc: linux-ide@vger.kernel.org
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 @@ /* For SCSI -> ATAPI command conversion */ #include <scsi/scsi.h> -#include <linux/irq.h> #include <linux/io.h> #include <asm/byteorder.h> #include <linux/uaccess.h> |