git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'unicore32' of git://github.com/gxt/linux
[pandora-kernel.git]
/
arch
/
unicore32
/
Kconfig
diff --git
a/arch/unicore32/Kconfig
b/arch/unicore32/Kconfig
index
e57dcce
..
942ed61
100644
(file)
--- 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"
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 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
select MISC_DEVICES
select EEPROM_AT24