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
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
arch
/
ppc
/
platforms
/
tqm8260_setup.c
diff --git
a/arch/ppc/platforms/tqm8260_setup.c
b/arch/ppc/platforms/tqm8260_setup.c
index
8916652
..
1241ed5
100644
(file)
--- a/
arch/ppc/platforms/tqm8260_setup.c
+++ b/
arch/ppc/platforms/tqm8260_setup.c
@@
-17,7
+17,7
@@
#include <linux/config.h>
#include <linux/seq_file.h>
#include <linux/config.h>
#include <linux/seq_file.h>
-#include <asm/immap_
8260
.h>
+#include <asm/immap_
cpm2
.h>
#include <asm/mpc8260.h>
#include <asm/machdep.h>
#include <asm/mpc8260.h>
#include <asm/machdep.h>
@@
-44,8
+44,8
@@
tqm8260_show_cpuinfo(struct seq_file *m)
static int
tqm8260_set_rtc_time(unsigned long time)
{
static int
tqm8260_set_rtc_time(unsigned long time)
{
- ((
immap_t *)I
MAP_ADDR)->im_sit.sit_tmcnt = time;
- ((
immap_t *)I
MAP_ADDR)->im_sit.sit_tmcntsc = 0x3;
+ ((
cpm2_map_t *)CPM_
MAP_ADDR)->im_sit.sit_tmcnt = time;
+ ((
cpm2_map_t *)CPM_
MAP_ADDR)->im_sit.sit_tmcntsc = 0x3;
return(0);
}
return(0);
}
@@
-53,7
+53,7
@@
tqm8260_set_rtc_time(unsigned long time)
static unsigned long
tqm8260_get_rtc_time(void)
{
static unsigned long
tqm8260_get_rtc_time(void)
{
- return ((
immap_t *)I
MAP_ADDR)->im_sit.sit_tmcnt;
+ return ((
cpm2_map_t *)CPM_
MAP_ADDR)->im_sit.sit_tmcnt;
}
static void __init
}
static void __init