From ba94a1bba3600d387edba7eb451990d9891e1c2f Mon Sep 17 00:00:00 2001
From: Wolfgang Denk <wd@castor.denx.de>
Date: Tue, 30 May 2006 15:56:48 +0200
Subject: * Update Intel IXP4xx support - Add IXP4xx NPE ethernet MAC support -
 Add support for Intel IXDPG425 board - Add support for Prodrive PDNB3 board -
 Add IRQ support Patch by Stefan Roese, 23 May 2006

[This patch does not include cpu/ixp/npe/IxNpeMicrocode.c which still
 sufferes from licensing issues. Blame Intel.]
---
 cpu/ixp/timer.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'cpu/ixp/timer.c')

diff --git a/cpu/ixp/timer.c b/cpu/ixp/timer.c
index 8df2a31f5c0..920f34e6128 100644
--- a/cpu/ixp/timer.c
+++ b/cpu/ixp/timer.c
@@ -1,5 +1,7 @@
-/* vi: set ts=8 sw=8 noet: */
 /*
+ * (C) Copyright 2006
+ * Stefan Roese, DENX Software Engineering, sr@denx.de.
+ *
  * (C) Copyright 2002
  * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
  * Marius Groeger <mgroeger@sysgo.de>
@@ -30,6 +32,7 @@
 #include <common.h>
 #include <asm/arch/ixp425.h>
 
+#ifndef CONFIG_USE_IRQ
 ulong get_timer (ulong base)
 {
        return get_timer_masked () - base;
@@ -77,3 +80,4 @@ ulong get_timer_masked (void)
 	}
 	return (reload_constant - current);
 }
+#endif /* #ifndef CONFIG_USE_IRQ */
-- 
cgit v1.2.3