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 'for-linus' of git://www.jni.nu/cris
[pandora-kernel.git]
/
arch
/
cris
/
Kconfig
diff --git
a/arch/cris/Kconfig
b/arch/cris/Kconfig
index
04a7fc5
..
617925d
100644
(file)
--- a/
arch/cris/Kconfig
+++ b/
arch/cris/Kconfig
@@
-296,8
+296,7
@@
config ETRAX_RTC
choice
prompt "RTC chip"
depends on ETRAX_RTC
- default ETRAX_PCF8563 if ETRAX_ARCH_V32
- default ETRAX_DS1302 if ETRAX_ARCH_V10
+ default ETRAX_DS1302
config ETRAX_DS1302
depends on ETRAX_ARCH_V10