lkml.org 
[lkml]   [2011]   [Sep]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 03/28] keyboard: Do not include <linux/irq.>
    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.>, 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’

    drivers/tty/vt/keyboard.c needs to include <asm/irq_regs.h> for get_irq_regs():

    | drivers/tty/vt/keyboard.c:497: error: implicit declaration of function ‘get_irq_regs’
    | drivers/tty/vt/keyboard.c:497: warning: initialization makes pointer from integer without a cast

    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Acked-by: Thomas Gleixner <tglx@linutronix.de>
    Cc: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    drivers/tty/vt/keyboard.c | 3 ++-
    1 files changed, 2 insertions(+), 1 deletions(-)

    diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
    index 3761ccf..a605549 100644
    --- a/drivers/tty/vt/keyboard.c
    +++ b/drivers/tty/vt/keyboard.c
    @@ -33,7 +33,6 @@
    #include <linux/string.h>
    #include <linux/init.h>
    #include <linux/slab.h>
    -#include <linux/irq.h>

    #include <linux/kbd_kern.h>
    #include <linux/kbd_diacr.h>
    @@ -43,6 +42,8 @@
    #include <linux/notifier.h>
    #include <linux/jiffies.h>

    +#include <asm/irq_regs.h>
    +
    extern void ctrl_alt_del(void);

    /*
    --
    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-09-11 14:09    [W:0.025 / U:2.724 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site