git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'exec_rm_compat' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg...
[pandora-kernel.git]
/
arch
/
sparc
/
kernel
/
time_32.c
diff --git
a/arch/sparc/kernel/time_32.c
b/arch/sparc/kernel/time_32.c
index
96046a4
..
1060e06
100644
(file)
--- a/
arch/sparc/kernel/time_32.c
+++ b/
arch/sparc/kernel/time_32.c
@@
-228,14
+228,10
@@
static void __init sbus_time_init(void)
void __init time_init(void)
{
-#ifdef CONFIG_PCI
- extern void pci_time_init(void);
- if (pcic_present()) {
+ if (pcic_present())
pci_time_init();
- return;
- }
-#endif
- sbus_time_init();
+ else
+ sbus_time_init();
}