diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-19 14:46:52 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-19 14:46:52 -0500 |
| commit | 828aac2ee239dca9c1856c4856a57912e6a487c4 (patch) | |
| tree | 44de8a7d318bbcef29da00992ebfa7356f470af7 /arch/arm/configs | |
| parent | 6fd7c7fe72a46dfd227fe8db0c7b6863af90a982 (diff) | |
| parent | 7971db5a4b4176ad5df590fce07a962c643a2740 (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/ukl/linux-2.6 into devel
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/netx_defconfig | 6 | ||||
| -rw-r--r-- | arch/arm/configs/picotux200_defconfig | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/configs/netx_defconfig b/arch/arm/configs/netx_defconfig index 0884f2370c3a..61d0fc5b2417 100644 --- a/arch/arm/configs/netx_defconfig +++ b/arch/arm/configs/netx_defconfig | |||
| @@ -728,9 +728,9 @@ CONFIG_RTC_CLASS=m | |||
| 728 | # | 728 | # |
| 729 | # RTC interfaces | 729 | # RTC interfaces |
| 730 | # | 730 | # |
| 731 | CONFIG_RTC_INTF_SYSFS=m | 731 | CONFIG_RTC_INTF_SYSFS=y |
| 732 | CONFIG_RTC_INTF_PROC=m | 732 | CONFIG_RTC_INTF_PROC=y |
| 733 | CONFIG_RTC_INTF_DEV=m | 733 | CONFIG_RTC_INTF_DEV=y |
| 734 | 734 | ||
| 735 | # | 735 | # |
| 736 | # RTC drivers | 736 | # RTC drivers |
diff --git a/arch/arm/configs/picotux200_defconfig b/arch/arm/configs/picotux200_defconfig index 14826f0dabde..59e4463c2da2 100644 --- a/arch/arm/configs/picotux200_defconfig +++ b/arch/arm/configs/picotux200_defconfig | |||
| @@ -1069,9 +1069,9 @@ CONFIG_RTC_CLASS=m | |||
| 1069 | # | 1069 | # |
| 1070 | # RTC interfaces | 1070 | # RTC interfaces |
| 1071 | # | 1071 | # |
| 1072 | CONFIG_RTC_INTF_SYSFS=m | 1072 | CONFIG_RTC_INTF_SYSFS=y |
| 1073 | CONFIG_RTC_INTF_PROC=m | 1073 | CONFIG_RTC_INTF_PROC=y |
| 1074 | CONFIG_RTC_INTF_DEV=m | 1074 | CONFIG_RTC_INTF_DEV=y |
| 1075 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | 1075 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set |
| 1076 | 1076 | ||
| 1077 | # | 1077 | # |