[netdrvr] 3c59x: remove irqs_disabled warning from local_bh_enable

[safe/jmp/linux-2.6] / drivers / rtc / Kconfig

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 45e4b96..4949dc4 100644 (file)
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -16,7 +16,7 @@ menuconfig RTC_CLASS
          probably want to enable one or more of the interfaces below.
 
          This driver can also be built as a module. If so, the module
          probably want to enable one or more of the interfaces below.
 
          This driver can also be built as a module. If so, the module

-         will be called rtc-class.
+         will be called rtc-core.

 
 if RTC_CLASS
 
 
 if RTC_CLASS
 


@@ -49,7 +49,7 @@ config RTC_HCTOSYS_DEVICE
 
          If the clock you specify here is not battery backed, it may still
          be useful to reinitialize system time when resuming from system
 
          If the clock you specify here is not battery backed, it may still
          be useful to reinitialize system time when resuming from system

-         sleep states.  Do not specify an RTC here unless it stays powered
+         sleep states. Do not specify an RTC here unless it stays powered

          during all this system's supported sleep states.
 
 config RTC_DEBUG
          during all this system's supported sleep states.
 
 config RTC_DEBUG


@@ -142,7 +142,7 @@ config RTC_DRV_DS1307
          will be called rtc-ds1307.
 
 config RTC_DRV_DS1374
          will be called rtc-ds1307.
 
 config RTC_DRV_DS1374

-       tristate "Maxim/Dallas Semiconductor DS1374 Real Time Clock"
+       tristate "Dallas/Maxim DS1374"

        depends on RTC_CLASS && I2C
        help
          If you say yes here you get support for Dallas Semiconductor
        depends on RTC_CLASS && I2C
        help
          If you say yes here you get support for Dallas Semiconductor


@@ -162,7 +162,7 @@ config RTC_DRV_DS1672
          will be called rtc-ds1672.
 
 config RTC_DRV_MAX6900
          will be called rtc-ds1672.
 
 config RTC_DRV_MAX6900

-       tristate "Maxim 6900"
+       tristate "Maxim MAX6900"

        help
          If you say yes here you will get support for the
          Maxim MAX6900 I2C RTC chip.
        help
          If you say yes here you will get support for the
          Maxim MAX6900 I2C RTC chip.


@@ -180,10 +180,10 @@ config RTC_DRV_RS5C372
          will be called rtc-rs5c372.
 
 config RTC_DRV_ISL1208
          will be called rtc-rs5c372.
 
 config RTC_DRV_ISL1208

-       tristate "Intersil 1208"
+       tristate "Intersil ISL1208"

        help
          If you say yes here you get support for the
        help
          If you say yes here you get support for the

-         Intersil 1208 RTC chip.
+         Intersil ISL1208 RTC chip.

 
          This driver can also be built as a module. If so, the module
          will be called rtc-isl1208.
 
          This driver can also be built as a module. If so, the module
          will be called rtc-isl1208.


@@ -220,7 +220,7 @@ config RTC_DRV_PCF8583
          will be called rtc-pcf8583.
 
 config RTC_DRV_M41T80
          will be called rtc-pcf8583.
 
 config RTC_DRV_M41T80

-       tristate "ST M41T80 series RTC"
+       tristate "ST M41T80/81/82/83/84/85/87"

        help
          If you say Y here you will get support for the
          ST M41T80 RTC chips series. Currently following chips are
        help
          If you say Y here you will get support for the
          ST M41T80 RTC chips series. Currently following chips are


@@ -246,29 +246,59 @@ config RTC_DRV_TWL92330
          platforms.  The support is integrated with the rest of
          the Menelaus driver; it's not separate module.
 
          platforms.  The support is integrated with the rest of
          the Menelaus driver; it's not separate module.
 

+config RTC_DRV_S35390A
+       tristate "Seiko Instruments S-35390A"
+       select BITREVERSE
+       help
+         If you say yes here you will get support for the Seiko
+         Instruments S-35390A.
+
+         This driver can also be built as a module. If so the module
+         will be called rtc-s35390a.
+
+config RTC_DRV_FM3130
+       tristate "Ramtron FM3130"
+       help
+         If you say Y here you will get support for the
+         Ramtron FM3130 RTC chips.
+         Ramtron FM3130 is a chip with two separate devices inside,
+         RTC clock and FRAM. This driver provides only RTC functionality.
+
+         This driver can also be built as a module. If so the module
+         will be called rtc-fm3130.
+

 endif # I2C
 
 comment "SPI RTC drivers"
 
 if SPI_MASTER
 
 endif # I2C
 
 comment "SPI RTC drivers"
 
 if SPI_MASTER
 

-config RTC_DRV_RS5C348
-       tristate "Ricoh RS5C348A/B"
+config RTC_DRV_MAX6902
+       tristate "Maxim MAX6902"

        help
        help

-         If you say yes here you get support for the
-         Ricoh RS5C348A and RS5C348B RTC chips.
+         If you say yes here you will get support for the
+         Maxim MAX6902 SPI RTC chip.

 
          This driver can also be built as a module. If so, the module
 
          This driver can also be built as a module. If so, the module

-         will be called rtc-rs5c348.
+         will be called rtc-max6902.

 
 

-config RTC_DRV_MAX6902
-       tristate "Maxim 6902"
+config RTC_DRV_R9701
+       tristate "Epson RTC-9701JE"

        help
          If you say yes here you will get support for the
        help
          If you say yes here you will get support for the

-         Maxim MAX6902 SPI RTC chip.
+         Epson RTC-9701JE SPI RTC chip.

 
          This driver can also be built as a module. If so, the module
 
          This driver can also be built as a module. If so, the module

-         will be called rtc-max6902.
+         will be called rtc-r9701.
+
+config RTC_DRV_RS5C348
+       tristate "Ricoh RS5C348A/B"
+       help
+         If you say yes here you get support for the
+         Ricoh RS5C348A and RS5C348B RTC chips.
+
+         This driver can also be built as a module. If so, the module
+         will be called rtc-rs5c348.

 
 endif # SPI_MASTER
 
 
 endif # SPI_MASTER
 


@@ -281,6 +311,7 @@ comment "Platform RTC drivers"
 config RTC_DRV_CMOS
        tristate "PC-style 'CMOS'"
        depends on X86 || ALPHA || ARM || M32R || ATARI || PPC || MIPS
 config RTC_DRV_CMOS
        tristate "PC-style 'CMOS'"
        depends on X86 || ALPHA || ARM || M32R || ATARI || PPC || MIPS

+       default y if X86

        help
          Say "yes" here to get direct support for the real time clock
          found in every PC or ACPI-based system, and some other boards.
        help
          Say "yes" here to get direct support for the real time clock
          found in every PC or ACPI-based system, and some other boards.


@@ -302,34 +333,50 @@ config RTC_DRV_DS1216
        help
          If you say yes here you get support for the Dallas DS1216 RTC chips.
 
        help
          If you say yes here you get support for the Dallas DS1216 RTC chips.
 

-config RTC_DRV_DS1553
-       tristate "Dallas DS1553"
+config RTC_DRV_DS1302
+       tristate "Dallas DS1302"
+       depends on SH_SECUREEDGE5410
+       help
+         If you say yes here you get support for the Dallas DS1302 RTC chips.
+
+config RTC_DRV_DS1511
+       tristate "Dallas DS1511"
+       depends on RTC_CLASS

        help
          If you say yes here you get support for the
        help
          If you say yes here you get support for the

-         Dallas DS1553 timekeeping chip.
+         Dallas DS1511 timekeeping/watchdog chip.

 
          This driver can also be built as a module. If so, the module
 
          This driver can also be built as a module. If so, the module

-         will be called rtc-ds1553.
+         will be called rtc-ds1511.

 
 

-config RTC_DRV_STK17TA8
-       tristate "Simtek STK17TA8"
-       depends on RTC_CLASS
+config RTC_DRV_DS1553
+       tristate "Maxim/Dallas DS1553"

        help
          If you say yes here you get support for the
        help
          If you say yes here you get support for the

-         Simtek STK17TA8 timekeeping chip.
+         Maxim/Dallas DS1553 timekeeping chip.

 
          This driver can also be built as a module. If so, the module
 
          This driver can also be built as a module. If so, the module

-         will be called rtc-stk17ta8.
+         will be called rtc-ds1553.

 
 config RTC_DRV_DS1742
 
 config RTC_DRV_DS1742

-       tristate "Dallas DS1742/1743"
+       tristate "Maxim/Dallas DS1742/1743"

        help
          If you say yes here you get support for the
        help
          If you say yes here you get support for the

-         Dallas DS1742/1743 timekeeping chip.
+         Maxim/Dallas DS1742/1743 timekeeping chip.

 
          This driver can also be built as a module. If so, the module
          will be called rtc-ds1742.
 
 
          This driver can also be built as a module. If so, the module
          will be called rtc-ds1742.
 

+config RTC_DRV_STK17TA8
+       tristate "Simtek STK17TA8"
+       depends on RTC_CLASS
+       help
+         If you say yes here you get support for the
+         Simtek STK17TA8 timekeeping chip.
+
+         This driver can also be built as a module. If so, the module
+         will be called rtc-stk17ta8.
+

 config RTC_DRV_M48T86
        tristate "ST M48T86/Dallas DS12887"
        help
 config RTC_DRV_M48T86
        tristate "ST M48T86/Dallas DS12887"
        help


@@ -440,10 +487,47 @@ config RTC_DRV_AT32AP700X
          AT32AP700x family processors.
 
 config RTC_DRV_AT91RM9200
          AT32AP700x family processors.
 
 config RTC_DRV_AT91RM9200

-       tristate "AT91RM9200"
-       depends on ARCH_AT91RM9200
-       help
-         Driver for the Atmel AT91RM9200's internal RTC (Realtime Clock).
+       tristate "AT91RM9200 or AT91SAM9RL"
+       depends on ARCH_AT91RM9200 || ARCH_AT91SAM9RL
+       help
+         Driver for the internal RTC (Realtime Clock) module found on
+         Atmel AT91RM9200's and AT91SAM9RL chips.  On SAM9RL chips
+         this is powered by the backup power supply.
+
+config RTC_DRV_AT91SAM9
+       tristate "AT91SAM9x"
+       depends on ARCH_AT91 && !(ARCH_AT91RM9200 || ARCH_AT91X40)
+       help
+         RTC driver for the Atmel AT91SAM9x internal RTT (Real Time Timer).
+         These timers are powered by the backup power supply (such as a
+         small coin cell battery), but do not need to be used as RTCs.
+
+         (On AT91SAM9rl chips you probably want to use the dedicated RTC
+         module and leave the RTT available for other uses.)
+
+config RTC_DRV_AT91SAM9_RTT
+       int
+       range 0 1
+       default 0
+       prompt "RTT module Number" if ARCH_AT91SAM9263
+       depends on RTC_DRV_AT91SAM9
+       help
+         More than one RTT module is available.  You can choose which
+         one will be used as an RTC.  The default of zero is normally
+         OK to use, though some systems use that for non-RTC purposes.
+
+config RTC_DRV_AT91SAM9_GPBR
+       int
+       range 0 3 if !ARCH_AT91SAM9263
+       range 0 15 if ARCH_AT91SAM9263
+       default 0
+       prompt "Backup Register Number"
+       depends on RTC_DRV_AT91SAM9
+       help
+         The RTC driver needs to use one of the General Purpose Backup
+         Registers (GPBRs) as well as the RTT.  You can choose which one
+         will be used.  The default of zero is normally OK to use, but
+         on some systems other software needs to use that register.

 
 config RTC_DRV_BFIN
        tristate "Blackfin On-Chip RTC"
 
 config RTC_DRV_BFIN
        tristate "Blackfin On-Chip RTC"


@@ -461,4 +545,12 @@ config RTC_DRV_RS5C313
        help
          If you say yes here you get support for the Ricoh RS5C313 RTC chips.
 
        help
          If you say yes here you get support for the Ricoh RS5C313 RTC chips.
 

+config RTC_DRV_PPC
+       tristate "PowerPC machine dependent RTC support"
+       depends on PPC_MERGE
+       help
+        The PowerPC kernel has machine-specific functions for accessing
+        the RTC. This exposes that functionality through the generic RTC
+        class.
+

 endif # RTC_CLASS
 endif # RTC_CLASS