Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/configh

[linux-2.6] / arch / frv / kernel / time.c

diff --git a/arch/frv/kernel/time.c b/arch/frv/kernel/time.c
index 7e55884135ed8ee2cf460cd0c03c0f223853256d..44a9aebc4f5a1637d1076510c1900c3aae33fa2c 100644 (file)
--- a/arch/frv/kernel/time.c
+++ b/arch/frv/kernel/time.c
@@ -10,7 +10,6 @@
  * 2 of the License, or (at your option) any later version.
  */
 
-#include <linux/config.h> /* CONFIG_HEARTBEAT */
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/sched.h>