diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-06-30 01:23:59 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-06-30 01:23:59 -0400 |
| commit | 6da49a292534d31ca391928ea97f8225774dc1e0 (patch) | |
| tree | 060c5f5f40dceb10d4528763bc7fc1ccc88210d9 /arch/arm/configs/xcep_defconfig | |
| parent | 17bdc6c0e979ae61879806e4dd93ec3b169d0931 (diff) | |
| parent | ca56a95eedcc95f8fea7b49c87565cd961d74fe2 (diff) | |
Merge remote branch 'origin/master' into next
Diffstat (limited to 'arch/arm/configs/xcep_defconfig')
| -rw-r--r-- | arch/arm/configs/xcep_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/xcep_defconfig b/arch/arm/configs/xcep_defconfig index 5b5504143647..721832ffe2d7 100644 --- a/arch/arm/configs/xcep_defconfig +++ b/arch/arm/configs/xcep_defconfig | |||
| @@ -73,7 +73,7 @@ CONFIG_SENSORS_MAX6650=m | |||
| 73 | # CONFIG_VGA_CONSOLE is not set | 73 | # CONFIG_VGA_CONSOLE is not set |
| 74 | # CONFIG_HID_SUPPORT is not set | 74 | # CONFIG_HID_SUPPORT is not set |
| 75 | # CONFIG_USB_SUPPORT is not set | 75 | # CONFIG_USB_SUPPORT is not set |
| 76 | CONFIG_RTC_CLASS=m | 76 | CONFIG_RTC_CLASS=y |
| 77 | CONFIG_RTC_DRV_SA1100=m | 77 | CONFIG_RTC_DRV_SA1100=m |
| 78 | CONFIG_DMADEVICES=y | 78 | CONFIG_DMADEVICES=y |
| 79 | # CONFIG_DNOTIFY is not set | 79 | # CONFIG_DNOTIFY is not set |