git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
arm
/
mach-s3c2410
/
time.c
diff --git
a/arch/arm/mach-s3c2410/time.c
b/arch/arm/mach-s3c2410/time.c
index
00d1cfc
..
10a2976
100644
(file)
--- a/
arch/arm/mach-s3c2410/time.c
+++ b/
arch/arm/mach-s3c2410/time.c
@@
-18,11
+18,11
@@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/init.h>
#include <linux/interrupt.h>
-#include <linux/irq.h>
#include <linux/err.h>
#include <linux/clk.h>
#include <linux/err.h>
#include <linux/clk.h>
@@
-138,16
+138,10
@@
s3c2410_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static struct irqaction s3c2410_timer_irq = {
.name = "S3C2410 Timer Tick",
static struct irqaction s3c2410_timer_irq = {
.name = "S3C2410 Timer Tick",
- .flags =
IRQF_DISABLED | IRQF
_TIMER,
+ .flags =
SA_INTERRUPT | SA
_TIMER,
.handler = s3c2410_timer_interrupt,
};
.handler = s3c2410_timer_interrupt,
};
-#define use_tclk1_12() ( \
- machine_is_bast() || \
- machine_is_vr1000() || \
- machine_is_anubis() || \
- machine_is_osiris() )
-
/*
* Set up timer interrupt, and return the current time in seconds.
*
/*
* Set up timer interrupt, and return the current time in seconds.
*
@@
-171,7
+165,7
@@
static void s3c2410_timer_setup (void)
/* configure the system for whichever machine is in use */
/* configure the system for whichever machine is in use */
- if (
use_tclk1_12
()) {
+ if (
machine_is_bast() || machine_is_vr1000() || machine_is_anubis
()) {
/* timer is at 12MHz, scaler is 1 */
timer_usec_ticks = timer_mask_usec_ticks(1, 12000000);
tcnt = 12000000 / HZ;
/* timer is at 12MHz, scaler is 1 */
timer_usec_ticks = timer_mask_usec_ticks(1, 12000000);
tcnt = 12000000 / HZ;