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
ieee1394: raw1394: arm functions slept in atomic context
[pandora-kernel.git]
/
arch
/
arm
/
mach-iop3xx
/
iop331-time.c
diff --git
a/arch/arm/mach-iop3xx/iop331-time.c
b/arch/arm/mach-iop3xx/iop331-time.c
index
1a6d9d6
..
0c09e74
100644
(file)
--- a/
arch/arm/mach-iop3xx/iop331-time.c
+++ b/
arch/arm/mach-iop3xx/iop331-time.c
@@
-23,7
+23,6
@@
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/uaccess.h>
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/uaccess.h>
-#include <asm/mach-types.h>
#include <asm/mach/irq.h>
#include <asm/mach/time.h>
#include <asm/mach/irq.h>
#include <asm/mach/time.h>
@@
-58,7
+57,7
@@
static unsigned long iop331_gettimeoffset(void)
/*
* Now convert them to usec.
*/
/*
* Now convert them to usec.
*/
- usec = (unsigned long)(elapsed
* (tick_nsec / 1000)) / LATCH
;
+ usec = (unsigned long)(elapsed
/ (CLOCK_TICK_RATE/1000000))
;
return usec;
}
return usec;
}
@@
-83,7
+82,7
@@
iop331_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static struct irqaction iop331_timer_irq = {
.name = "IOP331 Timer Tick",
.handler = iop331_timer_interrupt,
static struct irqaction iop331_timer_irq = {
.name = "IOP331 Timer Tick",
.handler = iop331_timer_interrupt,
- .flags =
SA_INTERRUPT | SA
_TIMER,
+ .flags =
IRQF_DISABLED | IRQF
_TIMER,
};
static void __init iop331_timer_init(void)
};
static void __init iop331_timer_init(void)