projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes
[linux-2.6-block.git]
/
arch
/
arm
/
mach-pxa
/
hx4700.c
diff --git
a/arch/arm/mach-pxa/hx4700.c
b/arch/arm/mach-pxa/hx4700.c
index 3fa929d4a4f5b748ec9885c11d255d33aa00b6cd..b83b95a2950342b298a8693b753217feacb4b5ab 100644
(file)
--- a/
arch/arm/mach-pxa/hx4700.c
+++ b/
arch/arm/mach-pxa/hx4700.c
@@
-681,11
+681,9
@@
static struct platform_device power_supply = {
static struct regulator_consumer_supply bq24022_consumers[] = {
{
- .dev = &gpio_vbus.dev,
.supply = "vbus_draw",
},
{
- .dev = &power_supply.dev,
.supply = "ac_draw",
},
};