diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-14 16:02:09 +0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-14 16:02:09 +0400 |
commit | 704867ede0c3645075ff3438d1a4fd4977abaa8d (patch) | |
tree | fc89b31764132dc1b07e0af3e53219005cfb8f95 /arch/unicore32/Kconfig | |
parent | 681ba97d9fbff59f67c71f1d9a88ad0b8ef49d25 (diff) | |
parent | cfe04478fa1b472264b7fe9bbf547710aa344d3c (diff) | |
download | linux-704867ede0c3645075ff3438d1a4fd4977abaa8d.tar.xz |
Merge branch 'mfd/da9052' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc into regmap-next
Diffstat (limited to 'arch/unicore32/Kconfig')
-rw-r--r-- | arch/unicore32/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig index e57dcce9bfda..942ed6174f1d 100644 --- a/arch/unicore32/Kconfig +++ b/arch/unicore32/Kconfig @@ -237,13 +237,13 @@ menu "PKUnity NetBook-0916 Features" config I2C_BATTERY_BQ27200 tristate "I2C Battery BQ27200 Support" - select PUV3_I2C + select I2C_PUV3 select POWER_SUPPLY select BATTERY_BQ27x00 config I2C_EEPROM_AT24 tristate "I2C EEPROMs AT24 support" - select PUV3_I2C + select I2C_PUV3 select MISC_DEVICES select EEPROM_AT24 |