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

Commit b2ab040d authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'master'

parents 1f57389a 741b2252

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 14

EXTRAVERSION =-rc5

EXTRAVERSION =

NAME=Affluent Albatross



# *DOCUMENTATION*

arch/arm/mach-pxa/corgi_lcd.c

+2 −0
Original line number Diff line number Diff line
@@ -488,6 +488,7 @@ static int is_pxafb_device(struct device * dev, void * data) 


unsigned long spitz_get_hsync_len(void)

{

#ifdef CONFIG_FB_PXA

	if (!spitz_pxafb_dev) {

		spitz_pxafb_dev = bus_find_device(&platform_bus_type, NULL, NULL, is_pxafb_device);

		if (!spitz_pxafb_dev)
@@ -496,6 +497,7 @@ unsigned long spitz_get_hsync_len(void) 
	if (!get_hsync_time)

		get_hsync_time = symbol_get(pxafb_get_hsync_time);

	if (!get_hsync_time)

#endif

		return 0;



	return pxafb_get_hsync_time(spitz_pxafb_dev);

arch/ppc64/kernel/mpic.c

+2 −2
Original line number Diff line number Diff line
@@ -506,8 +506,8 @@ struct mpic * __init mpic_alloc(unsigned long phys_addr, 
	mpic->senses_count = senses_count;



	/* Map the global registers */

	mpic->gregs = ioremap(phys_addr + MPIC_GREG_BASE, 0x1000);

	mpic->tmregs = mpic->gregs + (MPIC_TIMER_BASE >> 2);

	mpic->gregs = ioremap(phys_addr + MPIC_GREG_BASE, 0x2000);

	mpic->tmregs = mpic->gregs + ((MPIC_TIMER_BASE - MPIC_GREG_BASE) >> 2);

	BUG_ON(mpic->gregs == NULL);



	/* Reset */

drivers/char/drm/radeon_cp.c

+6 −5
Original line number Diff line number Diff line
@@ -1136,7 +1136,7 @@ static void radeon_cp_init_ring_buffer( drm_device_t *dev, 
	} else

#endif

		ring_start = (dev_priv->cp_ring->offset

			      - dev->sg->handle

			      - (unsigned long)dev->sg->virtual

			      + dev_priv->gart_vm_start);



	RADEON_WRITE( RADEON_CP_RB_BASE, ring_start );
@@ -1164,7 +1164,8 @@ static void radeon_cp_init_ring_buffer( drm_device_t *dev, 
		drm_sg_mem_t *entry = dev->sg;

		unsigned long tmp_ofs, page_ofs;



		tmp_ofs = dev_priv->ring_rptr->offset - dev->sg->handle;

		tmp_ofs = dev_priv->ring_rptr->offset -

				(unsigned long)dev->sg->virtual;

		page_ofs = tmp_ofs >> PAGE_SHIFT;



		RADEON_WRITE( RADEON_CP_RB_RPTR_ADDR,
@@ -1491,7 +1492,7 @@ static int radeon_do_init_cp( drm_device_t *dev, drm_radeon_init_t *init ) 
	else

#endif

		dev_priv->gart_buffers_offset = (dev->agp_buffer_map->offset

						- dev->sg->handle

					- (unsigned long)dev->sg->virtual

					+ dev_priv->gart_vm_start);



	DRM_DEBUG( "dev_priv->gart_size %d\n",

drivers/cpufreq/cpufreq_conservative.c

+3 −3
Original line number Diff line number Diff line
@@ -315,9 +315,9 @@ static void dbs_check_cpu(int cpu) 
	policy = this_dbs_info->cur_policy;



	if ( init_flag == 0 ) {

		for ( /* NULL */; init_flag < NR_CPUS; init_flag++ ) {

			dbs_info = &per_cpu(cpu_dbs_info, init_flag);

			requested_freq[cpu] = dbs_info->cur_policy->cur;

		for_each_online_cpu(j) {

			dbs_info = &per_cpu(cpu_dbs_info, j);

			requested_freq[j] = dbs_info->cur_policy->cur;

		}

		init_flag = 1;

	}