diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-03 19:46:45 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-03 19:46:45 -0400 |
| commit | 2b235826098bb653982894dfc3f70fd029f6c2e4 (patch) | |
| tree | ec525ddba74f58017a3f145bb68cf94376648c1c /arch/i386/kernel/cpu/mcheck/non-fatal.c | |
| parent | b4b52db71529bbe46da914eda772fb574914c94d (diff) | |
| parent | c77054e518d9163578cfcad09826d7b959f95ece (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/i386/kernel/cpu/mcheck/non-fatal.c')
| -rw-r--r-- | arch/i386/kernel/cpu/mcheck/non-fatal.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/i386/kernel/cpu/mcheck/non-fatal.c b/arch/i386/kernel/cpu/mcheck/non-fatal.c index 7864ddfccf0..82dffe0d495 100644 --- a/arch/i386/kernel/cpu/mcheck/non-fatal.c +++ b/arch/i386/kernel/cpu/mcheck/non-fatal.c @@ -12,7 +12,6 @@ #include <linux/kernel.h> #include <linux/jiffies.h> #include <linux/config.h> -#include <linux/irq.h> #include <linux/workqueue.h> #include <linux/interrupt.h> #include <linux/smp.h> |