diff options
author | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
commit | bac30d1a78d0f11c613968fc8b351a91ed465386 (patch) | |
tree | e52f3c876522a2f6047a6ec1c27df2e8a79486b8 /drivers/char/Kconfig | |
parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) |
Merge ../linux-2.6
Diffstat (limited to 'drivers/char/Kconfig')
-rw-r--r-- | drivers/char/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index 7a85b3a26ff8..889cad07774e 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig | |||
@@ -713,7 +713,7 @@ config NVRAM | |||
713 | 713 | ||
714 | config RTC | 714 | config RTC |
715 | tristate "Enhanced Real Time Clock Support" | 715 | tristate "Enhanced Real Time Clock Support" |
716 | depends on !PPC && !PARISC && !IA64 && !M68K && (!SPARC || PCI) && !FRV | 716 | depends on !PPC && !PARISC && !IA64 && !M68K && (!SPARC || PCI) && !FRV && !ARM |
717 | ---help--- | 717 | ---help--- |
718 | If you say Y here and create a character special file /dev/rtc with | 718 | If you say Y here and create a character special file /dev/rtc with |
719 | major number 10 and minor number 135 using mknod ("man mknod"), you | 719 | major number 10 and minor number 135 using mknod ("man mknod"), you |