diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-28 18:44:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-28 18:44:06 -0400 |
| commit | 5847098cd896c92819800e17e983bf6530035209 (patch) | |
| tree | 9ab836fd4290caca99223b9391885625e934e587 /arch/cris/Kconfig | |
| parent | 7f5fe3ec8eab23cc28e8fb7d23b4777ad6a05734 (diff) | |
| parent | 33dc0ad78a961dfbbb2fb65fd9df3b66ba119f57 (diff) | |
Merge branch 'for-linus' of git://www.jni.nu/cris
* 'for-linus' of git://www.jni.nu/cris:
Correct auto-restart of syscalls via restartblock
CRISv10: Fix return before mutex_unlock in pcf8563
Drop the CRISv32 version of pcf8563
Diffstat (limited to 'arch/cris/Kconfig')
| -rw-r--r-- | arch/cris/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig index 04a7fc5eaf46..617925ddd142 100644 --- a/arch/cris/Kconfig +++ b/arch/cris/Kconfig | |||
| @@ -296,8 +296,7 @@ config ETRAX_RTC | |||
| 296 | choice | 296 | choice |
| 297 | prompt "RTC chip" | 297 | prompt "RTC chip" |
| 298 | depends on ETRAX_RTC | 298 | depends on ETRAX_RTC |
| 299 | default ETRAX_PCF8563 if ETRAX_ARCH_V32 | 299 | default ETRAX_DS1302 |
| 300 | default ETRAX_DS1302 if ETRAX_ARCH_V10 | ||
| 301 | 300 | ||
| 302 | config ETRAX_DS1302 | 301 | config ETRAX_DS1302 |
| 303 | depends on ETRAX_ARCH_V10 | 302 | depends on ETRAX_ARCH_V10 |