Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...

[linux-2.6] / arch / arm / mach-footbridge / time.c

diff --git a/arch/arm/mach-footbridge/time.c b/arch/arm/mach-footbridge/time.c
index 5d02e95dede310ac52c00cb3e8832b5a83760d09..d5cfcda385d6f8abac08478802f590c7dbdf540a 100644 (file)
--- a/arch/arm/mach-footbridge/time.c
+++ b/arch/arm/mach-footbridge/time.c
@@ -115,8 +115,7 @@ static int set_isa_cmos_time(void)
 
 void __init isa_rtc_init(void)
 {
-       if (machine_is_co285() ||
-           machine_is_personal_server())
+       if (machine_is_personal_server())
                /*
                 * Add-in 21285s shouldn't access the RTC
                 */