diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-04 06:06:19 +0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-04 06:06:19 +0400 |
commit | 3c8c7b2f32c52b259daa7564fefd582146799b23 (patch) | |
tree | 59ff1ad0d6b7821d474d8fccafd884703684b6d7 /arch/i386/oprofile/nmi_timer_int.c | |
parent | 7cb3cd090c2725b80561958a362c2ba15a7a8c86 (diff) | |
parent | 9123e0d78990246304fe681167b8d8097f1e02d7 (diff) | |
download | linux-3c8c7b2f32c52b259daa7564fefd582146799b23.tar.xz |
Merge branch 'upstream-fixes'
Diffstat (limited to 'arch/i386/oprofile/nmi_timer_int.c')
-rw-r--r-- | arch/i386/oprofile/nmi_timer_int.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/oprofile/nmi_timer_int.c b/arch/i386/oprofile/nmi_timer_int.c index ad93cdd55d63..930a1127bb30 100644 --- a/arch/i386/oprofile/nmi_timer_int.c +++ b/arch/i386/oprofile/nmi_timer_int.c @@ -9,7 +9,7 @@ #include <linux/init.h> #include <linux/smp.h> -#include <linux/irq.h> +#include <linux/errno.h> #include <linux/oprofile.h> #include <linux/rcupdate.h> |