Message ID | 1319112675-27523-1-git-send-email-geert@linux-m68k.org |
---|---|
State | Accepted |
Delegated to: | David Miller |
Headers | show |
On Thu, Oct 20, 2011 at 02:11:15PM +0200, Geert Uytterhoeven wrote: > 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> > Cc: linux-ide@vger.kernel.org Acked-by: Borislav Petkov <bp@alien8.de> Thanks.
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index 04b0956..8126824 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> diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index 61fdf54..3d42043 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c @@ -35,7 +35,6 @@ #include <scsi/scsi_ioctl.h> #include <asm/byteorder.h> -#include <linux/irq.h> #include <linux/uaccess.h> #include <linux/io.h> #include <asm/unaligned.h> diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c index 7ecb1ad..ce8237d 100644 --- a/drivers/ide/ide-tape.c +++ b/drivers/ide/ide-tape.c @@ -41,7 +41,6 @@ #include <scsi/scsi.h> #include <asm/byteorder.h> -#include <linux/irq.h> #include <linux/uaccess.h> #include <linux/io.h> #include <asm/unaligned.h>