projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc
[powerpc.git]
/
arch
/
m32r
/
kernel
/
time.c
diff --git
a/arch/m32r/kernel/time.c
b/arch/m32r/kernel/time.c
index
2ebce20
..
ded0be0
100644
(file)
--- a/
arch/m32r/kernel/time.c
+++ b/
arch/m32r/kernel/time.c
@@
-17,7
+17,6
@@
#undef DEBUG_TIMER
#undef DEBUG_TIMER
-#include <linux/config.h>
#include <linux/errno.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/init.h>
#include <linux/module.h>
@@
-57,7
+56,7
@@
static unsigned long do_gettimeoffset(void)
#if defined(CONFIG_CHIP_M32102) || defined(CONFIG_CHIP_XNUX2) \
|| defined(CONFIG_CHIP_VDEC2) || defined(CONFIG_CHIP_M32700) \
#if defined(CONFIG_CHIP_M32102) || defined(CONFIG_CHIP_XNUX2) \
|| defined(CONFIG_CHIP_VDEC2) || defined(CONFIG_CHIP_M32700) \
- || defined(CONFIG_CHIP_OPSP)
+ || defined(CONFIG_CHIP_OPSP)
|| defined(CONFIG_CHIP_M32104)
#ifndef CONFIG_SMP
unsigned long count;
#ifndef CONFIG_SMP
unsigned long count;
@@
-238,7
+237,7
@@
irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
return IRQ_HANDLED;
}
return IRQ_HANDLED;
}
-struct irqaction irq0 = { timer_interrupt,
SA_INTERRUPT
, CPU_MASK_NONE,
+struct irqaction irq0 = { timer_interrupt,
IRQF_DISABLED
, CPU_MASK_NONE,
"MFT2", NULL, NULL };
void __init time_init(void)
"MFT2", NULL, NULL };
void __init time_init(void)
@@
-268,7
+267,7
@@
void __init time_init(void)
#if defined(CONFIG_CHIP_M32102) || defined(CONFIG_CHIP_XNUX2) \
|| defined(CONFIG_CHIP_VDEC2) || defined(CONFIG_CHIP_M32700) \
#if defined(CONFIG_CHIP_M32102) || defined(CONFIG_CHIP_XNUX2) \
|| defined(CONFIG_CHIP_VDEC2) || defined(CONFIG_CHIP_M32700) \
- || defined(CONFIG_CHIP_OPSP)
+ || defined(CONFIG_CHIP_OPSP)
|| defined(CONFIG_CHIP_M32104)
/* M32102 MFT setup */
setup_irq(M32R_IRQ_MFT2, &irq0);
/* M32102 MFT setup */
setup_irq(M32R_IRQ_MFT2, &irq0);