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
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
arch
/
arm
/
mach-ixp4xx
/
common.c
diff --git
a/arch/arm/mach-ixp4xx/common.c
b/arch/arm/mach-ixp4xx/common.c
index
7c25dbd
..
00b761f
100644
(file)
--- a/
arch/arm/mach-ixp4xx/common.c
+++ b/
arch/arm/mach-ixp4xx/common.c
@@
-13,6
+13,7
@@
* warranty of any kind, whether express or implied.
*/
* warranty of any kind, whether express or implied.
*/
+#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/init.h>
@@
-275,7
+276,7
@@
static irqreturn_t ixp4xx_timer_interrupt(int irq, void *dev_id, struct pt_regs
/*
* Catch up with the real idea of time
*/
/*
* Catch up with the real idea of time
*/
- while ((
signed long)(*IXP4XX_OSTS - last_jiffy_time) >=
LATCH) {
+ while ((
*IXP4XX_OSTS - last_jiffy_time) >
LATCH) {
timer_tick(regs);
last_jiffy_time += LATCH;
}
timer_tick(regs);
last_jiffy_time += LATCH;
}
@@
-287,7
+288,7
@@
static irqreturn_t ixp4xx_timer_interrupt(int irq, void *dev_id, struct pt_regs
static struct irqaction ixp4xx_timer_irq = {
.name = "IXP4xx Timer Tick",
static struct irqaction ixp4xx_timer_irq = {
.name = "IXP4xx Timer Tick",
- .flags =
IRQF_DISABLED | IRQF
_TIMER,
+ .flags =
SA_INTERRUPT | SA
_TIMER,
.handler = ixp4xx_timer_interrupt,
};
.handler = ixp4xx_timer_interrupt,
};