git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee13...
[pandora-kernel.git]
/
arch
/
arm
/
mach-imx
/
time.c
diff --git
a/arch/arm/mach-imx/time.c
b/arch/arm/mach-imx/time.c
index
ea805bf
..
8ae4a2c
100644
(file)
--- a/
arch/arm/mach-imx/time.c
+++ b/
arch/arm/mach-imx/time.c
@@
-8,11
+8,11
@@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
-#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/time.h>
#include <asm/hardware.h>
#include <linux/time.h>
#include <asm/hardware.h>
@@
-56,7
+56,7
@@
static unsigned long imx_gettimeoffset(void)
* IRQ handler for the timer
*/
static irqreturn_t
* IRQ handler for the timer
*/
static irqreturn_t
-imx_timer_interrupt(int irq, void *dev_id
, struct pt_regs *regs
)
+imx_timer_interrupt(int irq, void *dev_id)
{
write_seqlock(&xtime_lock);
{
write_seqlock(&xtime_lock);
@@
-64,7
+64,7
@@
imx_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
if (IMX_TSTAT(TIMER_BASE))
IMX_TSTAT(TIMER_BASE) = 0;
if (IMX_TSTAT(TIMER_BASE))
IMX_TSTAT(TIMER_BASE) = 0;
- timer_tick(
regs
);
+ timer_tick();
write_sequnlock(&xtime_lock);
return IRQ_HANDLED;
write_sequnlock(&xtime_lock);
return IRQ_HANDLED;
@@
-72,7
+72,7
@@
imx_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static struct irqaction imx_timer_irq = {
.name = "i.MX Timer Tick",
static struct irqaction imx_timer_irq = {
.name = "i.MX Timer Tick",
- .flags =
SA_INTERRUPT | SA
_TIMER,
+ .flags =
IRQF_DISABLED | IRQF
_TIMER,
.handler = imx_timer_interrupt,
};
.handler = imx_timer_interrupt,
};