diff options
| author | Olof Johansson <olof@lixom.net> | 2012-03-08 12:33:44 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-03-08 12:33:44 -0500 |
| commit | 990b07d952bff7116ba79e3c4ceeae5dd8d5ec3d (patch) | |
| tree | b0f6c896749f5beca20d74e72e4761aaa9e8ad2b /arch/arm/configs | |
| parent | 3a70b7e05f62d4e1bfd5744368ea1fd855b6e03c (diff) | |
| parent | 8a16a701ad787b6db2949766341c5ad1b551de9f (diff) | |
Merge branch 'regulator' of git://github.com/hzhuang1/linux into next/drivers
* 'regulator' of git://github.com/hzhuang1/linux: (2 commits)
regulator: Remove bq24022 regulator driver
pxa: magician/hx4700: Convert to gpio-regulator from bq24022
(plus update to v3.3-rc6)
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/magician_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/magician_defconfig b/arch/arm/configs/magician_defconfig index 443675d317e6..a691ef4c6008 100644 --- a/arch/arm/configs/magician_defconfig +++ b/arch/arm/configs/magician_defconfig | |||
| @@ -101,7 +101,7 @@ CONFIG_MFD_ASIC3=y | |||
| 101 | CONFIG_HTC_EGPIO=y | 101 | CONFIG_HTC_EGPIO=y |
| 102 | CONFIG_HTC_PASIC3=y | 102 | CONFIG_HTC_PASIC3=y |
| 103 | CONFIG_REGULATOR=y | 103 | CONFIG_REGULATOR=y |
| 104 | CONFIG_REGULATOR_BQ24022=y | 104 | CONFIG_REGULATOR_GPIO=y |
| 105 | CONFIG_FB=y | 105 | CONFIG_FB=y |
| 106 | CONFIG_FB_PXA=y | 106 | CONFIG_FB_PXA=y |
| 107 | CONFIG_FB_PXA_OVERLAY=y | 107 | CONFIG_FB_PXA_OVERLAY=y |