Commit 3ec7215e authored May 25, 2011 by 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: 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

parent 59433a59

drivers/ide/ide-cd.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -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>

drivers/ide/ide-floppy.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -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>

drivers/ide/ide-tape.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -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>

Admin message