Merge branch 'from-linus' into upstream

[linux-2.6-omap-h63xx.git] / arch / ia64 / kernel / perfmon_default_smpl.c

diff --git a/arch/ia64/kernel/perfmon_default_smpl.c b/arch/ia64/kernel/perfmon_default_smpl.c
index 344941db0a9edcd48b0e2c6099ec221b0cce7dd9..ff80eab83b38668b5d3a573f064e97b1d13f5715 100644 (file)
--- a/arch/ia64/kernel/perfmon_default_smpl.c
+++ b/arch/ia64/kernel/perfmon_default_smpl.c
@@ -8,7 +8,6 @@
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/module.h>
-#include <linux/config.h>
 #include <linux/init.h>
 #include <asm/delay.h>
 #include <linux/smp.h>