Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef267500 authored by Russell King's avatar Russell King
Browse files

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

parents a8d2518c 83a5d2d1

arch/arm/mach-pxa/hx4700.c

+1 −1
Original line number Diff line number Diff line
@@ -711,7 +711,7 @@ static struct regulator_consumer_supply bq24022_consumers[] = { 
static struct regulator_init_data bq24022_init_data = {

	.constraints = {

		.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),

	.consumer_supplies      = bq24022_consumers,

arch/arm/mach-pxa/magician.c

+1 −1
Original line number Diff line number Diff line
@@ -599,7 +599,7 @@ static struct regulator_consumer_supply bq24022_consumers[] = { 
static struct regulator_init_data bq24022_init_data = {

	.constraints = {

		.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),

	.consumer_supplies      = bq24022_consumers,

arch/arm/mm/proc-xscale.S

+1 −1
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ ENTRY(xscale_dma_a0_map_area) 
	teq	r2, #DMA_TO_DEVICE

	beq	xscale_dma_clean_range

	b	xscale_dma_flush_range

ENDPROC(xscsale_dma_a0_map_area)

ENDPROC(xscale_dma_a0_map_area)



/*

 *	dma_unmap_area(start, size, dir)