Commit 3ec7215e authored by Geert Uytterhoeven's avatar Geert Uytterhoeven

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: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarBorislav Petkov <bp@alien8.de>
Cc: linux-ide@vger.kernel.org
parent 59433a59
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
/* For SCSI -> ATAPI command conversion */ /* For SCSI -> ATAPI command conversion */
#include <scsi/scsi.h> #include <scsi/scsi.h>
#include <linux/irq.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
......
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#include <scsi/scsi_ioctl.h> #include <scsi/scsi_ioctl.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <linux/irq.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/unaligned.h> #include <asm/unaligned.h>
......
...@@ -41,7 +41,6 @@ ...@@ -41,7 +41,6 @@
#include <scsi/scsi.h> #include <scsi/scsi.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <linux/irq.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/unaligned.h> #include <asm/unaligned.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment