Skip to content

cloud-kernel
cloud-kernel

openanolis / cloud-kernel
1 年多 前同步成功

通知 160
Star 36
Fork 7
cloud-kernel
cloud-kernel
提交 ef267500 编写于 作者: R Russell King
浏览文件
操作

Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes

上级 a8d2518c 83a5d2d1
隐藏空白更改
内联 并排
Showing with 3 addition and 3 deletion
arch/arm/mach-pxa/hx4700.c
浏览文件 @ ef267500
...@@ -711,7 +711,7 @@ static struct regulator_consumer_supply bq24022_consumers[] = { ...@@ -711,7 +711,7 @@ static struct regulator_consumer_supply bq24022_consumers[] = {
static struct regulator_init_data bq24022_init_data = { static struct regulator_init_data bq24022_init_data = {
.constraints = { .constraints = {
.max_uA = 500000, .max_uA = 500000,
.valid_ops_mask = REGULATOR_CHANGE_CURRENT, .valid_ops_mask = REGULATOR_CHANGE_CURRENT|REGULATOR_CHANGE_STATUS,
}, },
.num_consumer_supplies = ARRAY_SIZE(bq24022_consumers), .num_consumer_supplies = ARRAY_SIZE(bq24022_consumers),
.consumer_supplies = bq24022_consumers, .consumer_supplies = bq24022_consumers,
......
arch/arm/mach-pxa/magician.c
浏览文件 @ ef267500
...@@ -599,7 +599,7 @@ static struct regulator_consumer_supply bq24022_consumers[] = { ...@@ -599,7 +599,7 @@ static struct regulator_consumer_supply bq24022_consumers[] = {
static struct regulator_init_data bq24022_init_data = { static struct regulator_init_data bq24022_init_data = {
.constraints = { .constraints = {
.max_uA = 500000, .max_uA = 500000,
.valid_ops_mask = REGULATOR_CHANGE_CURRENT, .valid_ops_mask = REGULATOR_CHANGE_CURRENT | REGULATOR_CHANGE_STATUS,
}, },
.num_consumer_supplies = ARRAY_SIZE(bq24022_consumers), .num_consumer_supplies = ARRAY_SIZE(bq24022_consumers),
.consumer_supplies = bq24022_consumers, .consumer_supplies = bq24022_consumers,
......
arch/arm/mm/proc-xscale.S
浏览文件 @ ef267500
...@@ -395,7 +395,7 @@ ENTRY(xscale_dma_a0_map_area) ...@@ -395,7 +395,7 @@ ENTRY(xscale_dma_a0_map_area)
teq r2, #DMA_TO_DEVICE teq r2, #DMA_TO_DEVICE
beq xscale_dma_clean_range beq xscale_dma_clean_range
b xscale_dma_flush_range b xscale_dma_flush_range
ENDPROC(xscsale_dma_a0_map_area) ENDPROC(xscale_dma_a0_map_area)
/* /*
* dma_unmap_area(start, size, dir) * dma_unmap_area(start, size, dir)
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或