summaryrefslogtreecommitdiff
path: root/drivers/sbus
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-24 15:57:43 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-24 15:57:43 -0700
commit9e72ea82e62dd714bc11ed29bfe09a7fc8ac24fe (patch)
treeb1797d88eb6ea57e618a68a23b960e4176449926 /drivers/sbus
parent03746bad30890284cc14fc39184c5b60b9cb8bc9 (diff)
parent1966287dfa07b2aa125009587a5d2b8375775c53 (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Mark most of initial bootup asm as .text.init.ref_ok [SPARC32]: Fix bug in sparc optimized memset. [SPARC64]: Update defconfig. [SPARC]: Add missing NOTES section. [SPARC32]: missing exports [SPARC32]: Deal with rtc/sun_mostek_rtc conflict.
Diffstat (limited to 'drivers/sbus')
-rw-r--r--drivers/sbus/char/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/sbus/char/Kconfig b/drivers/sbus/char/Kconfig
index 35a73168333..400c65bfb8c 100644
--- a/drivers/sbus/char/Kconfig
+++ b/drivers/sbus/char/Kconfig
@@ -15,6 +15,7 @@ config SUN_OPENPROMIO
config SUN_MOSTEK_RTC
tristate "Mostek real time clock support"
+ depends on SPARC32
help
The Mostek RTC chip is used on all known Sun computers except
some JavaStations. For a JavaStation you need to say Y both here