projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'timers/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
arch
/
arm
/
mach-footbridge
/
time.c
diff --git
a/arch/arm/mach-footbridge/time.c
b/arch/arm/mach-footbridge/time.c
index
5d02e95
..
d5cfcda
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
*/