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 git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-ebsa110
/
core.c
diff --git
a/arch/arm/mach-ebsa110/core.c
b/arch/arm/mach-ebsa110/core.c
index
6d620d8
..
90103ab
100644
(file)
--- a/
arch/arm/mach-ebsa110/core.c
+++ b/
arch/arm/mach-ebsa110/core.c
@@
-174,7
+174,7
@@
static unsigned long ebsa110_gettimeoffset(void)
}
static irqreturn_t
}
static irqreturn_t
-ebsa110_timer_interrupt(int irq, void *dev_id
, struct pt_regs *regs
)
+ebsa110_timer_interrupt(int irq, void *dev_id)
{
u32 count;
{
u32 count;
@@
-190,7
+190,7
@@
ebsa110_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
__raw_writeb(count & 0xff, PIT_T1);
__raw_writeb(count >> 8, PIT_T1);
__raw_writeb(count & 0xff, PIT_T1);
__raw_writeb(count >> 8, PIT_T1);
- timer_tick(
regs
);
+ timer_tick();
write_sequnlock(&xtime_lock);
write_sequnlock(&xtime_lock);
@@
-199,7
+199,7
@@
ebsa110_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static struct irqaction ebsa110_timer_irq = {
.name = "EBSA110 Timer Tick",
static struct irqaction ebsa110_timer_irq = {
.name = "EBSA110 Timer Tick",
- .flags =
SA_INTERRUPT | SA
_TIMER,
+ .flags =
IRQF_DISABLED | IRQF
_TIMER,
.handler = ebsa110_timer_interrupt,
};
.handler = ebsa110_timer_interrupt,
};