patch-2.1.79 linux/arch/ppc/kernel/prep_time.c

Next file: linux/arch/ppc/kernel/process.c
Previous file: linux/arch/ppc/kernel/prep_setup.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.78/linux/arch/ppc/kernel/prep_time.c linux/arch/ppc/kernel/prep_time.c
@@ -56,9 +56,9 @@
 
 int prep_cmos_clock_read(int addr)
 {
-	if ( _machine == _MACH_IBM )
+	if ( _prep_type == _PREP_IBM )
 		return CMOS_READ(addr);
-	else if ( _machine == _MACH_Motorola )
+	else if ( _prep_type == _PREP_Motorola )
 	{
 		outb(clock_transl[addr]>>8, NVRAM_AS1);
 		outb(clock_transl[addr], NVRAM_AS0);
@@ -71,12 +71,12 @@
 
 void prep_cmos_clock_write(unsigned long val, int addr)
 {
-	if ( _machine == _MACH_IBM )
+	if ( _prep_type == _PREP_IBM )
 	{
 		CMOS_WRITE(val,addr);
 		return;
 	}
-	else if ( _machine == _MACH_Motorola )
+	else if ( _prep_type == _PREP_Motorola )
 	{
 		outb(clock_transl[addr]>>8, NVRAM_AS1);
 		outb(clock_transl[addr], NVRAM_AS0);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov