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 branches 'stable/ia64', 'stable/blkfront-cleanup' and 'stable/cleanup' of git...
[pandora-kernel.git]
/
arch
/
m68knommu
/
platform
/
68360
/
config.c
diff --git
a/arch/m68knommu/platform/68360/config.c
b/arch/m68knommu/platform/68360/config.c
index
2b3196a
..
9dd5bca
100644
(file)
--- a/
arch/m68knommu/platform/68360/config.c
+++ b/
arch/m68knommu/platform/68360/config.c
@@
-75,7
+75,7
@@
void hw_timer_init(void)
/* Set compare register 32Khz / 32 / 10 = 100 */
TCMP = 10;
/* Set compare register 32Khz / 32 / 10 = 100 */
TCMP = 10;
- request_irq(IRQ_MACHSPEC | 1, timer_routine,
IRQ_FLG_LOCK
, "timer", NULL);
+ request_irq(IRQ_MACHSPEC | 1, timer_routine,
0
, "timer", NULL);
#endif
/* General purpose quicc timers: MC68360UM p7-20 */
#endif
/* General purpose quicc timers: MC68360UM p7-20 */
@@
-103,11
+103,6
@@
void hw_timer_init(void)
pquicc->timer_tgcr = tgcr_save;
}
pquicc->timer_tgcr = tgcr_save;
}
-unsigned long hw_timer_offset(void)
-{
- return 0;
-}
-
void BSP_gettod (int *yearp, int *monp, int *dayp,
int *hourp, int *minp, int *secp)
{
void BSP_gettod (int *yearp, int *monp, int *dayp,
int *hourp, int *minp, int *secp)
{