diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-04-13 17:29:07 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-04-13 17:29:07 -0400 |
| commit | f499cae1e59d75d5eb24c23d47cf8986e6032c6d (patch) | |
| tree | 1af6235c18391212c40116eb90b01eae8938efee /arch/arm/configs | |
| parent | fc3f55e672e1ed917dd9e215af81939cd3d717da (diff) | |
| parent | 80a04d3f2f94fb68b5df05e3ac6697130bc3467a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/magician_defconfig | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/configs/magician_defconfig b/arch/arm/configs/magician_defconfig index 82428c2f234c..f56837f69ca7 100644 --- a/arch/arm/configs/magician_defconfig +++ b/arch/arm/configs/magician_defconfig | |||
| @@ -1183,7 +1183,11 @@ CONFIG_RTC_INTF_DEV=y | |||
| 1183 | CONFIG_RTC_DRV_SA1100=y | 1183 | CONFIG_RTC_DRV_SA1100=y |
| 1184 | # CONFIG_RTC_DRV_PXA is not set | 1184 | # CONFIG_RTC_DRV_PXA is not set |
| 1185 | # CONFIG_DMADEVICES is not set | 1185 | # CONFIG_DMADEVICES is not set |
| 1186 | # CONFIG_REGULATOR is not set | 1186 | CONFIG_REGULATOR=y |
| 1187 | # CONFIG_REGULATOR_DEBUG is not set | ||
| 1188 | # CONFIG_REGULATOR_FIXED_VOLTAGE is not set | ||
| 1189 | # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set | ||
| 1190 | CONFIG_REGULATOR_BQ24022=y | ||
| 1187 | # CONFIG_UIO is not set | 1191 | # CONFIG_UIO is not set |
| 1188 | # CONFIG_STAGING is not set | 1192 | # CONFIG_STAGING is not set |
| 1189 | 1193 | ||