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

Commit dd41bf91 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm

parents 70ab81c2 7edc24c4

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);

include/asm-arm/bitops.h

+0 −1
Original line number Diff line number Diff line
@@ -347,7 +347,6 @@ static inline unsigned long __ffs(unsigned long word) 
 * the clz instruction for much better code efficiency.

 */



static __inline__ int generic_fls(int x);

#define fls(x) \

	( __builtin_constant_p(x) ? generic_fls(x) : \

	  ({ int __r; asm("clz\t%0, %1" : "=r"(__r) : "r"(x) : "cc"); 32-__r; }) )