lkml.org 
[lkml]   [2011]   [Oct]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 01/27] ide-{cd,floppy,tape}: Do not include <linux/irq.h>
    Date
    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
    ---
    drivers/ide/ide-cd.c | 1 -
    drivers/ide/ide-floppy.c | 1 -
    drivers/ide/ide-tape.c | 1 -
    3 files changed, 0 insertions(+), 3 deletions(-)

    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>
    --
    1.7.0.4
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2011-10-30 13:57    [W:0.026 / U:150.700 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site