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

Configure Feed

Select the types of activity you want to include in your feed.

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

+2 -1
+2
arch/arm/mach-pxa/corgi_lcd.c
··· 488 488 489 489 unsigned long spitz_get_hsync_len(void) 490 490 { 491 + #ifdef CONFIG_FB_PXA 491 492 if (!spitz_pxafb_dev) { 492 493 spitz_pxafb_dev = bus_find_device(&platform_bus_type, NULL, NULL, is_pxafb_device); 493 494 if (!spitz_pxafb_dev) ··· 497 496 if (!get_hsync_time) 498 497 get_hsync_time = symbol_get(pxafb_get_hsync_time); 499 498 if (!get_hsync_time) 499 + #endif 500 500 return 0; 501 501 502 502 return pxafb_get_hsync_time(spitz_pxafb_dev);
-1
include/asm-arm/bitops.h
··· 347 347 * the clz instruction for much better code efficiency. 348 348 */ 349 349 350 - static __inline__ int generic_fls(int x); 351 350 #define fls(x) \ 352 351 ( __builtin_constant_p(x) ? generic_fls(x) : \ 353 352 ({ int __r; asm("clz\t%0, %1" : "=r"(__r) : "r"(x) : "cc"); 32-__r; }) )