fix up the other rtc interfaces too

svn path=/dists/trunk/linux-2.6/; revision=8680
This commit is contained in:
Maximilian Attems 2007-05-21 16:55:41 +00:00
parent 4a47828782
commit 601d1b02dd
8 changed files with 22 additions and 17 deletions

View File

@ -1707,8 +1707,8 @@ CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
#
# RTC interfaces
#
CONFIG_RTC_INTF_SYSFS=m
CONFIG_RTC_INTF_PROC=m
CONFIG_RTC_INTF_SYSFS=y
CONFIG_RTC_INTF_PROC=y
CONFIG_RTC_INTF_DEV=y
#

View File

@ -1060,8 +1060,8 @@ CONFIG_RTC_CLASS=m
#
# RTC interfaces
#
CONFIG_RTC_INTF_SYSFS=m
CONFIG_RTC_INTF_PROC=m
CONFIG_RTC_INTF_SYSFS=y
CONFIG_RTC_INTF_PROC=y
CONFIG_RTC_INTF_DEV=y
# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set

11
debian/arch/config vendored
View File

@ -829,11 +829,18 @@ CONFIG_NETFILTER_XT_MATCH_POLICY=m
# CONFIG_RTC_DRV_TEST is not set
CONFIG_W1_MASTER_MATROX=m
CONFIG_INFINIBAND_IPATH=m
#
## RTC interfaces
#
CONFIG_RTC_INTF_SYSFS=y
CONFIG_RTC_INTF_PROC=y
CONFIG_RTC_INTF_DEV=y
# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
# CONFIG_VGACON_SOFT_SCROLLBACK is not set
CONFIG_USB_ZC0301=m
CONFIG_VIDEO_MSP3400=m
CONFIG_RTC_INTF_SYSFS=m
CONFIG_RTC_DRV_CMOS=m
CONFIG_RTC_DRV_X1205=m
CONFIG_LEDS_TRIGGER_IDE_DISK=y
@ -850,7 +857,6 @@ CONFIG_VIDEO_USBVIDEO=m
# CONFIG_USB_GADGET_AT91 is not set
CONFIG_RTC_CLASS=m
CONFIG_RTC_DRV_PCF8563=m
CONFIG_RTC_INTF_PROC=m
CONFIG_BCM43XX_DMA=y
CONFIG_GIGASET_M105=m
CONFIG_GIGASET_M101=m
@ -995,7 +1001,6 @@ CONFIG_MCS_FIR=m
# CONFIG_IPW2200_PROMISCUOUS is not set
CONFIG_INET6_XFRM_MODE_TUNNEL=m
CONFIG_VIDEO_PVRUSB2_SYSFS=y
# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
CONFIG_INFINIBAND_ISER=m
CONFIG_NETFILTER_XT_MATCH_QUOTA=m

View File

@ -2766,8 +2766,8 @@ CONFIG_RTC_CLASS=m
#
# RTC interfaces
#
CONFIG_RTC_INTF_SYSFS=m
CONFIG_RTC_INTF_PROC=m
CONFIG_RTC_INTF_SYSFS=y
CONFIG_RTC_INTF_PROC=y
CONFIG_RTC_INTF_DEV=y
# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set

View File

@ -999,8 +999,8 @@ CONFIG_RTC_CLASS=m
#
# RTC interfaces
#
CONFIG_RTC_INTF_SYSFS=m
CONFIG_RTC_INTF_PROC=m
CONFIG_RTC_INTF_SYSFS=y
CONFIG_RTC_INTF_PROC=y
CONFIG_RTC_INTF_DEV=y
# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set

View File

@ -2767,8 +2767,8 @@ CONFIG_RTC_CLASS=m
#
# RTC interfaces
#
CONFIG_RTC_INTF_SYSFS=m
CONFIG_RTC_INTF_PROC=m
CONFIG_RTC_INTF_SYSFS=y
CONFIG_RTC_INTF_PROC=y
CONFIG_RTC_INTF_DEV=y
# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set

View File

@ -1004,8 +1004,8 @@ CONFIG_RTC_CLASS=m
#
# RTC interfaces
#
CONFIG_RTC_INTF_SYSFS=m
CONFIG_RTC_INTF_PROC=m
CONFIG_RTC_INTF_SYSFS=y
CONFIG_RTC_INTF_PROC=y
CONFIG_RTC_INTF_DEV=y
# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set

4
debian/changelog vendored
View File

@ -12,9 +12,9 @@ linux-2.6 (2.6.22~rc2-1~experimental.1) UNRELEASED; urgency=low
* [amd64, i386]: Take care of the renaming acpi-ibm to thinkpad-acpi.
Enable KINGSUN_DONGLE, AF_RXRPC, RXKAD, MTD_NAND_PLATFORM, BLINK.
* Enable WLAN_PRE80211 and WLAN_80211 on all archs with NET_RADIO enabled.
* Fix RTC_INTF_DEV=y where enabled modular.
* Fix RTC_INTF_{DEV,SYSFS,PROC}=y where enabled modular.
-- maximilian attems <maks@debian.org> Mon, 21 May 2007 18:51:17 +0200
-- maximilian attems <maks@debian.org> Mon, 21 May 2007 18:56:48 +0200
linux-2.6 (2.6.21-3) UNRELEASED; urgency=low