diff options
author | Paul Mackerras <paulus@samba.org> | 2006-03-29 04:24:50 +0200 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-03-29 04:24:50 +0200 |
commit | bac30d1a78d0f11c613968fc8b351a91ed465386 (patch) | |
tree | e52f3c876522a2f6047a6ec1c27df2e8a79486b8 /drivers/char/Kconfig | |
parent | [PATCH] powerpc: Kill _machine and hard-coded platform numbers (diff) | |
parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
download | linux-bac30d1a78d0f11c613968fc8b351a91ed465386.tar.xz linux-bac30d1a78d0f11c613968fc8b351a91ed465386.zip |
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 config RTC tristate "Enhanced Real Time Clock Support" - depends on !PPC && !PARISC && !IA64 && !M68K && (!SPARC || PCI) && !FRV + depends on !PPC && !PARISC && !IA64 && !M68K && (!SPARC || PCI) && !FRV && !ARM ---help--- If you say Y here and create a character special file /dev/rtc with major number 10 and minor number 135 using mknod ("man mknod"), you |