commit ef267500094632e0b8229e284e7295ef858da362 · tjh.dev/kernel

tjh.dev / kernel

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

fork atom

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

Russell King 15 years ago ef267500 a8d2518c

+3 -3

3 changed files

expand all

unified split

arch

arm

mach-pxa

hx4700.c

magician.c

proc-xscale.S

+1 -1

arch/arm/mach-pxa/hx4700.c

··· 711 static struct regulator_init_data bq24022_init_data = { 712 .constraints = { 713 .max_uA = 500000, 714 - .valid_ops_mask = REGULATOR_CHANGE_CURRENT, 715 }, 716 .num_consumer_supplies = ARRAY_SIZE(bq24022_consumers), 717 .consumer_supplies = bq24022_consumers,

··· 711 static struct regulator_init_data bq24022_init_data = { 712 .constraints = { 713 .max_uA = 500000, 714 + .valid_ops_mask = REGULATOR_CHANGE_CURRENT|REGULATOR_CHANGE_STATUS, 715 }, 716 .num_consumer_supplies = ARRAY_SIZE(bq24022_consumers), 717 .consumer_supplies = bq24022_consumers,

+1 -1

arch/arm/mach-pxa/magician.c

··· 599 static struct regulator_init_data bq24022_init_data = { 600 .constraints = { 601 .max_uA = 500000, 602 - .valid_ops_mask = REGULATOR_CHANGE_CURRENT, 603 }, 604 .num_consumer_supplies = ARRAY_SIZE(bq24022_consumers), 605 .consumer_supplies = bq24022_consumers,

··· 599 static struct regulator_init_data bq24022_init_data = { 600 .constraints = { 601 .max_uA = 500000, 602 + .valid_ops_mask = REGULATOR_CHANGE_CURRENT | REGULATOR_CHANGE_STATUS, 603 }, 604 .num_consumer_supplies = ARRAY_SIZE(bq24022_consumers), 605 .consumer_supplies = bq24022_consumers,

+1 -1

arch/arm/mm/proc-xscale.S

··· 395 teq r2, #DMA_TO_DEVICE 396 beq xscale_dma_clean_range 397 b xscale_dma_flush_range 398 - ENDPROC(xscsale_dma_a0_map_area) 399 400 /* 401 * dma_unmap_area(start, size, dir)

··· 395 teq r2, #DMA_TO_DEVICE 396 beq xscale_dma_clean_range 397 b xscale_dma_flush_range 398 + ENDPROC(xscale_dma_a0_map_area) 399 400 /* 401 * dma_unmap_area(start, size, dir)