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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
powerpc
/
platforms
/
iseries
/
mf.c
diff --git
a/arch/powerpc/platforms/iseries/mf.c
b/arch/powerpc/platforms/iseries/mf.c
index
d771b8e
..
1a2c2a5
100644
(file)
--- a/
arch/powerpc/platforms/iseries/mf.c
+++ b/
arch/powerpc/platforms/iseries/mf.c
@@
-45,7
+45,6
@@
#include "setup.h"
#include "setup.h"
-extern int piranha_simulator;
static int mf_initialized;
/*
static int mf_initialized;
/*
@@
-658,7
+657,7
@@
static void mf_clear_src(void)
void __init mf_display_progress(u16 value)
{
void __init mf_display_progress(u16 value)
{
- if (
piranha_simulator ||
!mf_initialized)
+ if (!mf_initialized)
return;
if (0xFFFF == value)
return;
if (0xFFFF == value)
@@
-1295,9
+1294,6
@@
__initcall(mf_proc_init);
*/
void iSeries_get_rtc_time(struct rtc_time *rtc_tm)
{
*/
void iSeries_get_rtc_time(struct rtc_time *rtc_tm)
{
- if (piranha_simulator)
- return;
-
mf_get_rtc(rtc_tm);
rtc_tm->tm_mon--;
}
mf_get_rtc(rtc_tm);
rtc_tm->tm_mon--;
}
@@
-1316,9
+1312,6
@@
unsigned long iSeries_get_boot_time(void)
{
struct rtc_time tm;
{
struct rtc_time tm;
- if (piranha_simulator)
- return 0;
-
mf_get_boot_rtc(&tm);
return mktime(tm.tm_year + 1900, tm.tm_mon, tm.tm_mday,
tm.tm_hour, tm.tm_min, tm.tm_sec);
mf_get_boot_rtc(&tm);
return mktime(tm.tm_year + 1900, tm.tm_mon, tm.tm_mday,
tm.tm_hour, tm.tm_min, tm.tm_sec);