diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-17 10:56:34 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-17 10:56:34 -0800 |
| commit | 7652aab77fbf6de8bcc69ee6a864270b0da6b3f6 (patch) | |
| tree | cc380ac53a720a905232463cd8fed9cb27875723 /arch/mips/jmr3927 | |
| parent | cd02e27b1514a27b2a8ab59755ae6d23d4d8a10f (diff) | |
| parent | aec8b7557cf0fc4dac059112328b5aa89271c77e (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Diffstat (limited to 'arch/mips/jmr3927')
| -rw-r--r-- | arch/mips/jmr3927/common/rtc_ds1742.c | 2 | ||||
| -rw-r--r-- | arch/mips/jmr3927/rbhma3100/setup.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/jmr3927/common/rtc_ds1742.c b/arch/mips/jmr3927/common/rtc_ds1742.c index 8b407d7dc46..9a8bff153d8 100644 --- a/arch/mips/jmr3927/common/rtc_ds1742.c +++ b/arch/mips/jmr3927/common/rtc_ds1742.c @@ -41,11 +41,11 @@ #include <linux/types.h> #include <linux/time.h> #include <linux/rtc.h> +#include <linux/ds1742rtc.h> #include <asm/time.h> #include <asm/addrspace.h> -#include <asm/jmr3927/ds1742rtc.h> #include <asm/debug.h> #define EPOCH 2000 diff --git a/arch/mips/jmr3927/rbhma3100/setup.c b/arch/mips/jmr3927/rbhma3100/setup.c index 3e2fbdc6609..55ad0a57879 100644 --- a/arch/mips/jmr3927/rbhma3100/setup.c +++ b/arch/mips/jmr3927/rbhma3100/setup.c @@ -357,7 +357,7 @@ static void __init jmr3927_board_init(void) jmr3927_io_dipsw()); } -void __init plat_setup(void) +void __init tx3927_setup(void) { int i; |