diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-28 10:30:45 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-28 10:30:45 -0400 |
| commit | ef267500094632e0b8229e284e7295ef858da362 (patch) | |
| tree | 46542e8580ee1cae2d75a816b049dafbfa457d38 /arch | |
| parent | a8d2518c2a7235f0b772c1f1bd30218130e631a7 (diff) | |
| parent | 83a5d2d1b4cc06ce17b44873e004fc0b55552183 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-pxa/hx4700.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/magician.c | 2 | ||||
| -rw-r--r-- | arch/arm/mm/proc-xscale.S | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/hx4700.c b/arch/arm/mach-pxa/hx4700.c index 6de0ad0eea65..9cdcca597924 100644 --- a/arch/arm/mach-pxa/hx4700.c +++ b/arch/arm/mach-pxa/hx4700.c | |||
| @@ -711,7 +711,7 @@ static struct regulator_consumer_supply bq24022_consumers[] = { | |||
| 711 | static struct regulator_init_data bq24022_init_data = { | 711 | static struct regulator_init_data bq24022_init_data = { |
| 712 | .constraints = { | 712 | .constraints = { |
| 713 | .max_uA = 500000, | 713 | .max_uA = 500000, |
| 714 | .valid_ops_mask = REGULATOR_CHANGE_CURRENT, | 714 | .valid_ops_mask = REGULATOR_CHANGE_CURRENT|REGULATOR_CHANGE_STATUS, |
| 715 | }, | 715 | }, |
| 716 | .num_consumer_supplies = ARRAY_SIZE(bq24022_consumers), | 716 | .num_consumer_supplies = ARRAY_SIZE(bq24022_consumers), |
| 717 | .consumer_supplies = bq24022_consumers, | 717 | .consumer_supplies = bq24022_consumers, |
diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c index a72993dde2b3..9984ef70bd79 100644 --- a/arch/arm/mach-pxa/magician.c +++ b/arch/arm/mach-pxa/magician.c | |||
| @@ -599,7 +599,7 @@ static struct regulator_consumer_supply bq24022_consumers[] = { | |||
| 599 | static struct regulator_init_data bq24022_init_data = { | 599 | static struct regulator_init_data bq24022_init_data = { |
| 600 | .constraints = { | 600 | .constraints = { |
| 601 | .max_uA = 500000, | 601 | .max_uA = 500000, |
| 602 | .valid_ops_mask = REGULATOR_CHANGE_CURRENT, | 602 | .valid_ops_mask = REGULATOR_CHANGE_CURRENT | REGULATOR_CHANGE_STATUS, |
| 603 | }, | 603 | }, |
| 604 | .num_consumer_supplies = ARRAY_SIZE(bq24022_consumers), | 604 | .num_consumer_supplies = ARRAY_SIZE(bq24022_consumers), |
| 605 | .consumer_supplies = bq24022_consumers, | 605 | .consumer_supplies = bq24022_consumers, |
diff --git a/arch/arm/mm/proc-xscale.S b/arch/arm/mm/proc-xscale.S index ce233bcbf506..42af97664c9d 100644 --- a/arch/arm/mm/proc-xscale.S +++ b/arch/arm/mm/proc-xscale.S | |||
| @@ -395,7 +395,7 @@ ENTRY(xscale_dma_a0_map_area) | |||
| 395 | teq r2, #DMA_TO_DEVICE | 395 | teq r2, #DMA_TO_DEVICE |
| 396 | beq xscale_dma_clean_range | 396 | beq xscale_dma_clean_range |
| 397 | b xscale_dma_flush_range | 397 | b xscale_dma_flush_range |
| 398 | ENDPROC(xscsale_dma_a0_map_area) | 398 | ENDPROC(xscale_dma_a0_map_area) |
| 399 | 399 | ||
| 400 | /* | 400 | /* |
| 401 | * dma_unmap_area(start, size, dir) | 401 | * dma_unmap_area(start, size, dir) |