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-lh7a40x
/
time.c
diff --git
a/arch/arm/mach-lh7a40x/time.c
b/arch/arm/mach-lh7a40x/time.c
index
ad5652e
..
be377e3
100644
(file)
--- a/
arch/arm/mach-lh7a40x/time.c
+++ b/
arch/arm/mach-lh7a40x/time.c
@@
-1,4
+1,4
@@
-/*
+/*
* arch/arm/mach-lh7a40x/time.c
*
* Copyright (C) 2004 Logic Product Development
* arch/arm/mach-lh7a40x/time.c
*
* Copyright (C) 2004 Logic Product Development
@@
-8,10
+8,10
@@
* version 2 as published by the Free Software Foundation.
*
*/
* version 2 as published by the Free Software Foundation.
*
*/
+#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/interrupt.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/interrupt.h>
-#include <linux/irq.h>
#include <linux/time.h>
#include <asm/hardware.h>
#include <linux/time.h>
#include <asm/hardware.h>
@@
-53,11
+53,11
@@
lh7a40x_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static struct irqaction lh7a40x_timer_irq = {
.name = "LHA740x Timer Tick",
static struct irqaction lh7a40x_timer_irq = {
.name = "LHA740x Timer Tick",
- .flags =
IRQF_DISABLED | IRQF
_TIMER,
+ .flags =
SA_INTERRUPT | SA
_TIMER,
.handler = lh7a40x_timer_interrupt,
};
.handler = lh7a40x_timer_interrupt,
};
-static void __init lh7a40x_timer_init
(void)
+static void __init lh7a40x_timer_init(void)
{
/* Stop/disable all timers */
TIMER_CONTROL1 = 0;
{
/* Stop/disable all timers */
TIMER_CONTROL1 = 0;