The patch titled
h8300: move new timer.h from include/asm-h8300 to arch/h8300/include/asm
has been added to the -mm tree. Its filename is
h8300-move-new-timerh-from-include-asm-h8300-to-arch-h8300-include-asm.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: h8300: move new timer.h from include/asm-h8300 to arch/h8300/include/asm
From: Roland Dreier <rdreier@xxxxxxxxx>
Commit e0b0f9e4 ("h8300: update timer handler - new files") added a new
<asm/timer.h> for h8300 under include/, but since 758db3f2 ("[h8300] move
include/asm-h8300 to arch/h8300/include/asm") the h8300 includes have been
in arch/h8300/include/asm. Move timer.h there too.
Signed-off-by: Roland Dreier <rolandd@xxxxxxxxx>
Cc: Yoshinori Sato <ysato@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/h8300/include/asm/timer.h | 25 +++++++++++++++++++++++++
include/asm-h8300/timer.h | 25 -------------------------
2 files changed, 25 insertions(+), 25 deletions(-)
diff -puN include/asm-h8300/timer.h~h8300-move-new-timerh-from-include-asm-h8300-to-arch-h8300-include-asm /dev/null
--- a/include/asm-h8300/timer.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef __H8300_TIMER_H
-#define __H8300_TIMER_H
-
-void h8300_timer_tick(void);
-void h8300_timer_setup(void);
-void h8300_gettod(unsigned int *year, unsigned int *mon, unsigned int *day,
- unsigned int *hour, unsigned int *min, unsigned int *sec);
-
-#define TIMER_FREQ (CONFIG_CPU_CLOCK*10000) /* Timer input freq. */
-
-#define calc_param(cnt, div, rate, limit) \
-do { \
- cnt = TIMER_FREQ / HZ; \
- for (div = 0; div < ARRAY_SIZE(divide_rate); div++) { \
- if (rate[div] == 0) \
- continue; \
- if ((cnt / rate[div]) > limit) \
- break; \
- } \
- if (div == ARRAY_SIZE(divide_rate)) \
- panic("Timer counter overflow"); \
- cnt /= divide_rate[div]; \
-} while(0)
-
-#endif
diff -puN /dev/null arch/h8300/include/asm/timer.h
--- /dev/null
+++ a/arch/h8300/include/asm/timer.h
@@ -0,0 +1,25 @@
+#ifndef __H8300_TIMER_H
+#define __H8300_TIMER_H
+
+void h8300_timer_tick(void);
+void h8300_timer_setup(void);
+void h8300_gettod(unsigned int *year, unsigned int *mon, unsigned int *day,
+ unsigned int *hour, unsigned int *min, unsigned int *sec);
+
+#define TIMER_FREQ (CONFIG_CPU_CLOCK*10000) /* Timer input freq. */
+
+#define calc_param(cnt, div, rate, limit) \
+do { \
+ cnt = TIMER_FREQ / HZ; \
+ for (div = 0; div < ARRAY_SIZE(divide_rate); div++) { \
+ if (rate[div] == 0) \
+ continue; \
+ if ((cnt / rate[div]) > limit) \
+ break; \
+ } \
+ if (div == ARRAY_SIZE(divide_rate)) \
+ panic("Timer counter overflow"); \
+ cnt /= divide_rate[div]; \
+} while(0)
+
+#endif
_
Patches currently in -mm which might be from rdreier@xxxxxxxxx are
origin.patch
h8300-move-new-timerh-from-include-asm-h8300-to-arch-h8300-include-asm.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
